Fix issue with static ipconfig not creating dhcp ip configs properly.

chrome/browser/chromeos/cros/network_library.cc

 // Copyright (c) 2011 The Chromium 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 "chrome/browser/chromeos/cros/network_library.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/i18n/icu_encoding_detection.h"
@@ skipping 3370 matching lines @@
         chromeos::ListIPConfigs(ipconfig.device_path.c_str());
     if (ipconfig_status) {
       for (int i = 0; i < ipconfig_status->size; i++) {
         if (ipconfig_status->ips[i].type == chromeos::IPCONFIG_TYPE_DHCP)
           ipconfig_dhcp = &ipconfig_status->ips[i];
         else if (ipconfig_status->ips[i].type == chromeos::IPCONFIG_TYPE_IPV4)
           ipconfig_static = &ipconfig_status->ips[i];
       }
     }
 
-    // If switching from dhcp to static, then create new static ip config.
     IPConfigStatus* ipconfig_status2 = NULL;
-    if (ipconfig.type == chromeos::IPCONFIG_TYPE_IPV4 && !ipconfig_static) {
-      // Create new static ip config.
-      chromeos::AddIPConfig(ipconfig.device_path.c_str(),
-                            chromeos::IPCONFIG_TYPE_IPV4);
-      // Now find the newly created IP config.
-      ipconfig_status2 = chromeos::ListIPConfigs(ipconfig.device_path.c_str());
-      if (ipconfig_status2) {
-        for (int i = 0; i < ipconfig_status2->size; i++) {
-          if (ipconfig_status2->ips[i].type == chromeos::IPCONFIG_TYPE_IPV4)
-            ipconfig_static = &ipconfig_status2->ips[i];
+    if (ipconfig.type == chromeos::IPCONFIG_TYPE_DHCP) {
+      // If switching from static to dhcp, create new dhcp ip config.
+      if (!ipconfig_dhcp)
+        chromeos::AddIPConfig(ipconfig.device_path.c_str(),
+                              chromeos::IPCONFIG_TYPE_DHCP);
+      // User wants DHCP now. So delete the static ip config.
+      if (ipconfig_static)
+        chromeos::RemoveIPConfig(ipconfig_static);

[stevenjb, 2011/06/01 22:53:51]

Do we need to set ipconfig_static = NULL here so that we don't execute the if
(ipconfig_static) logic below?

[Charlie Lee, 2011/06/01 22:58:07]

we no longer use ipconfig_static anymore in this method. the code you are
referring to is in the other if/else block.

On 2011/06/01 22:53:51, Steven Bennetts wrote:

+    } else if (ipconfig.type == chromeos::IPCONFIG_TYPE_IPV4) {
+      // If switching from dhcp to static, create new static ip config.
+      if (!ipconfig_static) {
+        chromeos::AddIPConfig(ipconfig.device_path.c_str(),
+                              chromeos::IPCONFIG_TYPE_IPV4);
+        // Now find the newly created IP config.
+        ipconfig_status2 =
+            chromeos::ListIPConfigs(ipconfig.device_path.c_str());
+        if (ipconfig_status2) {
+          for (int i = 0; i < ipconfig_status2->size; i++) {
+            if (ipconfig_status2->ips[i].type == chromeos::IPCONFIG_TYPE_IPV4)
+              ipconfig_static = &ipconfig_status2->ips[i];
+          }
         }
       }
-    }
-
-    if (ipconfig.type == chromeos::IPCONFIG_TYPE_DHCP) {
-      if (ipconfig_static) {
-        // User wants DHCP now. So delete the static ip config.
-        chromeos::RemoveIPConfig(ipconfig_static);
-      }
-    } else if (ipconfig.type == chromeos::IPCONFIG_TYPE_IPV4) {
       if (ipconfig_static) {
         // Save any changed details.
         if (ipconfig.address != ipconfig_static->address) {
           scoped_ptr<Value> value(Value::CreateStringValue(ipconfig.address));
           chromeos::SetNetworkIPConfigProperty(ipconfig_static->path,
                                                kAddressProperty,
                                                value.get());
         }
         if (ipconfig.netmask != ipconfig_static->netmask) {
           int32 prefixlen = ipconfig.GetPrefixLength();
@@ skipping 14 matching lines @@
                                                value.get());
         }
         if (ipconfig.name_servers != ipconfig_static->name_servers) {
           scoped_ptr<Value> value(
               Value::CreateStringValue(ipconfig.name_servers));
           chromeos::SetNetworkIPConfigProperty(ipconfig_static->path,
                                                kNameServersProperty,
                                                value.get());
         }
         // Remove dhcp ip config if there is one.
-        if (ipconfig_dhcp) {
+        if (ipconfig_dhcp)
           chromeos::RemoveIPConfig(ipconfig_dhcp);
-        }
       }
     }
 
     if (ipconfig_status)
       chromeos::FreeIPConfigStatus(ipconfig_status);
     if (ipconfig_status2)
       chromeos::FreeIPConfigStatus(ipconfig_status2);
   }
 
  private:
@@ skipping 1625 matching lines @@
     return new NetworkLibraryStubImpl();
   else
     return new NetworkLibraryImpl();
 }
 
 }  // namespace chromeos
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::NetworkLibraryImpl);