commit f9b0ca8ba854fe017f6315b5d037aa7b6dfd7827
author Darin Petkov <petkov@chromium.org> Mon Jun 20 12:10:23 2011 -0700
committer Darin Petkov <petkov@chromium.org> Tue Jun 21 10:23:02 2011 -0700
tree 3df48c2c4f62ce25431b6ee66fd620c51039c18c
parent 98dd6a0c9facbd208c6f08ad4150f7d384a8a5ea

shill: Handle success/failure events from dhcpcd.

BUG=chromium-os:16718
TEST=unit tests

Change-Id: I36d8b737a060f7b295ebab26aa37b4e71022b4f0
Reviewed-on: http://gerrit.chromium.org/gerrit/2880
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Chris Masone <cmasone@chromium.org>

dhcp_config.cc

diff --git a/dhcp_config.cc b/dhcp_config.cc
index ffe219b..8f5bf63 100644
--- a/dhcp_config.cc
+++ b/dhcp_config.cc
@@ -30,6 +30,12 @@
 const char DHCPConfig::kDHCPCDPath[] = "/sbin/dhcpcd";
 const char DHCPConfig::kDHCPCDPathFormatLease[] = "var/run/dhcpcd-%s.lease";
 const char DHCPConfig::kDHCPCDPathFormatPID[] = "var/run/dhcpcd-%s.pid";
+const char DHCPConfig::kReasonBound[] = "BOUND";
+const char DHCPConfig::kReasonFail[] = "FAIL";
+const char DHCPConfig::kReasonRebind[] = "REBIND";
+const char DHCPConfig::kReasonReboot[] = "REBOOT";
+const char DHCPConfig::kReasonRenew[] = "RENEW";
+
 
 DHCPConfig::DHCPConfig(DHCPProvider *provider,
                        DeviceConstRefPtr device,
@@ -98,16 +104,24 @@
   }
 }
 
-void DHCPConfig::ProcessEventSignal(const std::string &reason,
+void DHCPConfig::ProcessEventSignal(const string &reason,
                                     const Configuration &configuration) {
   LOG(INFO) << "Event reason: " << reason;
-
-  IPConfig::Properties properties;
-  if (!ParseConfiguration(configuration, &properties)) {
-    LOG(ERROR) << "Unable to parse the new DHCP configuration -- ignored.";
+  if (reason == kReasonFail) {
+    LOG(ERROR) << "Received failure event from DHCP client.";
+    UpdateProperties(IPConfig::Properties(), false);
     return;
   }
-  UpdateProperties(properties);
+  if (reason != kReasonBound &&
+      reason != kReasonRebind &&
+      reason != kReasonReboot &&
+      reason != kReasonRenew) {
+    LOG(WARNING) << "Event ignored.";
+    return;
+  }
+  IPConfig::Properties properties;
+  CHECK(ParseConfiguration(configuration, &properties));
+  UpdateProperties(properties, true);
 }
 
 bool DHCPConfig::Start() {
@@ -232,11 +246,7 @@
   VLOG(2) << "pid " << pid << " exit status " << status;
   DHCPConfig *config = reinterpret_cast<DHCPConfig *>(data);
   config->child_watch_tag_ = 0;
-
   CHECK_EQ(pid, config->pid_);
-  config->glib_->SpawnClosePID(pid);
-  config->pid_ = 0;
-
   config->CleanupClientState();
 
   // |config| instance may be destroyed after this call.
@@ -252,6 +262,7 @@
     glib_->SpawnClosePID(pid_);
     pid_ = 0;
   }
+  proxy_.reset();
   file_util::Delete(root_.Append(base::StringPrintf(kDHCPCDPathFormatLease,
                                                     GetDeviceName().c_str())),
                     false);