vpn-manager: accept a hostname for remote host

l2tp_manager.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 "vpn-manager/l2tp_manager.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chromeos/process.h"
@@ skipping 19 matching lines @@
 using ::chromeos::ProcessImpl;
 
 L2tpManager::L2tpManager()
     : ServiceManager("l2tp"),
       was_initiated_(false),
       output_fd_(-1),
       ppp_interface_path_(kPppInterfacePath),
       l2tpd_(new ProcessImpl) {
 }
 
-bool L2tpManager::Initialize(const std::string& remote_address) {
-  remote_address_ = remote_address;
+bool L2tpManager::Initialize(const std::string& remote_host) {
+  remote_host_ = remote_host;
   if (FLAGS_user.empty()) {
     LOG(ERROR) << "l2tp layer requires user name";
     return false;
   }
   if (!FLAGS_pppd_plugin.empty() &&
       !file_util::PathExists(FilePath(FLAGS_pppd_plugin))) {
     LOG(WARNING) << "pppd_plugin (" << FLAGS_pppd_plugin << ") does not exist";
   }
   if (!FLAGS_password.empty()) {
     LOG(WARNING) << "Passing a password on the command-line is insecure";
   }
   return true;
 }
 
 static void AddString(std::string* config, const char* key,
                       const std::string& value) {
   config->append(StringPrintf("%s = %s\n", key, value.c_str()));
 }
 
 static void AddBool(std::string* config, const char* key, bool value) {
   config->append(StringPrintf("%s = %s\n", key, value ? "yes" : "no"));
 }
 
 std::string L2tpManager::FormatL2tpdConfiguration(
     const std::string& ppp_config_path) {
   std::string l2tpd_config;
   l2tpd_config.append(StringPrintf("[lac %s]\n", kL2tpConnectionName));
-  AddString(&l2tpd_config, "lns", remote_address_);
+  AddString(&l2tpd_config, "lns", remote_host_);
   AddBool(&l2tpd_config, "require chap", FLAGS_require_chap);
   AddBool(&l2tpd_config, "refuse pap", FLAGS_refuse_pap);
   AddBool(&l2tpd_config, "require authentication",
           FLAGS_require_authentication);
   AddString(&l2tpd_config, "name", FLAGS_user);
   AddBool(&l2tpd_config, "ppp debug", FLAGS_ppp_debug);
   AddString(&l2tpd_config, "pppoptfile", ppp_config_path);
   AddBool(&l2tpd_config, "length bit", FLAGS_length_bit);
   return l2tpd_config;
 }
@@ skipping 125 matching lines @@
   return pid == l2tpd_->pid();
 }
 
 void L2tpManager::Stop() {
   if (l2tpd_->pid()) {
     LOG(INFO) << "Shutting down L2TP";
     Terminate();
   }
   OnStopped(false);
 }