vpn-manager: Fix l2tp/ipsec connections to Windows RRAS server

ipsec_manager_test.cc

 // Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "chromeos/process_mock.h"
 #include "chromeos/syslog_logging.h"
 #include "chromeos/test_helpers.h"
 #include "gflags/gflags.h"
@@ skipping 202 matching lines @@
   SetStartStarterExpectations(true);
   EXPECT_TRUE(ipsec_.StartStarter());
   EXPECT_EQ(kMockFd, ipsec_.output_fd());
   EXPECT_EQ("ipsec[10001]: ", ipsec_.ipsec_prefix_);
 }
 
 void IpsecManagerTestIkeV1Psk::CheckStarter(const std::string& actual) {
   const char kExpected[] =
       "config setup\n"
       "\tcharonstart=no\n"
+      "\tnat_traversal=yes\n"
       "conn managed\n"
+      "\tike=3des-sha1-modp1024\n"
       "\tkeyexchange=ikev1\n"
       "\tauthby=psk\n"
       "\tpfs=no\n"
       "\trekey=no\n"
       "\tleft=%defaultroute\n"
       "\tleftprotoport=17/1701\n"
       "\tleftupdown=/usr/libexec/l2tpipsec_vpn/pluto_updown\n"
       "\tright=1.2.3.4\n"
       "\trightprotoport=17/1701\n"
+      "\ttype=transport\n"
       "\tauto=start\n";
   EXPECT_EQ(kExpected, actual);
 }
 
 TEST_F(IpsecManagerTestIkeV1Psk, FormatStarterConfigFile) {
   CheckStarter(ipsec_.FormatStarterConfigFile());
 }
 
 TEST_F(IpsecManagerTestIkeV1Psk, Start) {
   InSequence unused;
@@ skipping 22 matching lines @@
 
 TEST_F(IpsecManagerTestIkeV1Certs, Initialize) {
   DoInitialize(1, false);
 }
 
 
 int main(int argc, char** argv) {
   SetUpTests(&argc, argv, true);
   return RUN_ALL_TESTS();
 }