commit f65e928d8cd59338cec95a7daa6957f6c510fd2e
author Darin Petkov <petkov@chromium.org> Tue Jun 21 14:29:56 2011 -0700
committer Darin Petkov <petkov@chromium.org> Wed Jun 22 09:47:28 2011 -0700
tree 4d30deeadabe8da018d931d1696fde68d147702a
parent b54601c6f85577ab326da277356b88049d92ee2b

shill: Remove IPConfig/DHCPConfig's dependency on Device.

They care about the device name only so use that instead. This eliminates the
need for some circular dependencies.

BUG=chromium-os:16796
TEST=unit tests

Change-Id: Ibfa4eacac2b04b9311abfb76972aaf032c6013aa
Reviewed-on: http://gerrit.chromium.org/gerrit/2943
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Darin Petkov <petkov@chromium.org>

dhcp_config.cc

diff --git a/dhcp_config.cc b/dhcp_config.cc
index 8f5bf63..cc225c5 100644
--- a/dhcp_config.cc
+++ b/dhcp_config.cc
@@ -38,19 +38,19 @@
 
 
 DHCPConfig::DHCPConfig(DHCPProvider *provider,
-                       DeviceConstRefPtr device,
+                       const string &device_name,
                        GLibInterface *glib)
-    : IPConfig(device),
+    : IPConfig(device_name),
       provider_(provider),
       pid_(0),
       child_watch_tag_(0),
       root_("/"),
       glib_(glib) {
-  VLOG(2) << __func__ << ": " << GetDeviceName();
+  VLOG(2) << __func__ << ": " << device_name;
 }
 
 DHCPConfig::~DHCPConfig() {
-  VLOG(2) << __func__ << ": " << GetDeviceName();
+  VLOG(2) << __func__ << ": " << device_name();
 
   // Don't leave behind dhcpcd running.
   Stop();
@@ -60,7 +60,7 @@
 }
 
 bool DHCPConfig::RequestIP() {
-  VLOG(2) << __func__ << ": " << GetDeviceName();
+  VLOG(2) << __func__ << ": " << device_name();
   if (!pid_) {
     return Start();
   }
@@ -72,7 +72,7 @@
 }
 
 bool DHCPConfig::RenewIP() {
-  VLOG(2) << __func__ << ": " << GetDeviceName();
+  VLOG(2) << __func__ << ": " << device_name();
   if (!pid_) {
     return false;
   }
@@ -80,12 +80,12 @@
     LOG(ERROR) << "Unable to renew IP before acquiring destination.";
     return false;
   }
-  proxy_->DoRebind(GetDeviceName());
+  proxy_->DoRebind(device_name());
   return true;
 }
 
 bool DHCPConfig::ReleaseIP() {
-  VLOG(2) << __func__ << ": " << GetDeviceName();
+  VLOG(2) << __func__ << ": " << device_name();
   if (!pid_) {
     return true;
   }
@@ -93,7 +93,7 @@
     LOG(ERROR) << "Unable to release IP before acquiring destination.";
     return false;
   }
-  proxy_->DoRelease(GetDeviceName());
+  proxy_->DoRelease(device_name());
   Stop();
   return true;
 }
@@ -125,12 +125,12 @@
 }
 
 bool DHCPConfig::Start() {
-  VLOG(2) << __func__ << ": " << GetDeviceName();
+  VLOG(2) << __func__ << ": " << device_name();
 
   char *argv[4] = {
     const_cast<char *>(kDHCPCDPath),
     const_cast<char *>("-B"),  // foreground
-    const_cast<char *>(GetDeviceName().c_str()),
+    const_cast<char *>(device_name().c_str()),
     NULL
   };
   char *envp[1] = { NULL };
@@ -264,10 +264,10 @@
   }
   proxy_.reset();
   file_util::Delete(root_.Append(base::StringPrintf(kDHCPCDPathFormatLease,
-                                                    GetDeviceName().c_str())),
+                                                    device_name().c_str())),
                     false);
   file_util::Delete(root_.Append(base::StringPrintf(kDHCPCDPathFormatPID,
-                                                    GetDeviceName().c_str())),
+                                                    device_name().c_str())),
                     false);
 }