vpn-manager: accept a hostname for remote host

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 14 matching lines @@
 
 class IpsecManagerTest : public ::testing::Test {
  public:
   void SetUp() {
     file_util::GetCurrentDirectory(&test_path_);
     test_path_ = test_path_.Append("test");
     file_util::Delete(test_path_, true);
     file_util::CreateDirectory(test_path_);
     stateful_container_ = test_path_.Append("etc");
     file_util::CreateDirectory(stateful_container_);
-    remote_ = "1.2.3.4";
+    remote_ = "vpnserver";
     ServiceManager::temp_path_ = new FilePath(test_path_);
     psk_file_ = test_path_.Append("psk").value();
     server_ca_file_ = test_path_.Append("server.ca").value();
     client_key_file_ = test_path_.Append("client.key").value();
     client_cert_file_ = test_path_.Append("client.cert").value();
     ipsec_run_path_ = test_path_.Append("run").value();
     ipsec_up_file_ = FilePath(ipsec_run_path_).Append("up").value();
     WriteFile(psk_file_, "secret");
     WriteFile(server_ca_file_, "");
     WriteFile(client_key_file_, "");
     WriteFile(client_cert_file_, "");
     chromeos::ClearLog();
     starter_ = new ProcessMock;
     ipsec_.starter_.reset(starter_);
     ipsec_.stateful_container_ = stateful_container_.value();
     ipsec_.ipsec_group_ = getgid();
     ipsec_.ipsec_run_path_ = ipsec_run_path_;
     ipsec_.ipsec_up_file_ = ipsec_up_file_;
     ipsec_.force_local_address_ = "5.6.7.8";
+    ipsec_.force_remote_address_ = "1.2.3.4";
   }
 
   void SetStartStarterExpectations(bool already_running);
 
  protected:
   void WriteFile(const std::string& file_path, const char* contents) {
     if (file_util::WriteFile(FilePath(file_path), contents,
                              strlen(contents)) < 0) {
       LOG(ERROR) << "Unable to create " << file_path;
     }
@@ skipping 111 matching lines @@
     DoInitialize(1, true);
   }
 
  protected:
   void CheckStarter(const std::string& actual);
 };
 
 TEST_F(IpsecManagerTestIkeV1Psk, Initialize) {
 }
 
-TEST_F(IpsecManagerTestIkeV1Psk, GetLocalAddressForRemote) {
+TEST_F(IpsecManagerTestIkeV1Psk, GetAddressesFromRemoteHost) {
   ipsec_.force_local_address_ = NULL;
   std::string local_address;
-  EXPECT_TRUE(ipsec_.GetLocalAddressForRemote("127.0.0.1", &local_address));
+  std::string remote_address;
+  EXPECT_TRUE(ipsec_.GetAddressesFromRemoteHost("localhost",
+                                                &remote_address,
+                                                &local_address));
   EXPECT_EQ("127.0.0.1", local_address);
+  EXPECT_EQ("127.0.0.1", remote_address);
 }
 
 TEST_F(IpsecManagerTestIkeV1Psk, FormatPsk) {
   FilePath input(test_path_.Append("psk"));
   const char psk[] = "pAssword\n";
   file_util::WriteFile(input, psk, strlen(psk));
   FilePath output;
   std::string formatted;
   EXPECT_TRUE(ipsec_.FormatPsk(input, &formatted));
   EXPECT_EQ("5.6.7.8 1.2.3.4 : PSK \"pAssword\"\n", formatted);
@@ skipping 22 matching lines @@
       "\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"
+      "\tright=vpnserver\n"
       "\trightprotoport=17/1701\n"
       "\ttype=transport\n"
       "\tauto=start\n";
   EXPECT_EQ(kExpected, actual);
 }
 
 TEST_F(IpsecManagerTestIkeV1Psk, FormatStarterConfigFile) {
   CheckStarter(ipsec_.FormatStarterConfigFile());
 }
 
@@ skipping 24 matching lines @@
 
 TEST_F(IpsecManagerTestIkeV1Certs, Initialize) {
   DoInitialize(1, false);
 }
 
 
 int main(int argc, char** argv) {
   SetUpTests(&argc, argv, true);
   return RUN_ALL_TESTS();
 }