Ignore ERROR_ADDRESS_NOT_ASSOCIATED from IpReleaseAddress in WiFiService::ResetDHCP.

components/wifi/wifi_service_win.cc

 // Copyright 2013 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 "components/wifi/wifi_service.h"
 
 #include <iphlpapi.h>
 #include <objbase.h>
 #include <wlanapi.h>
 
@@ skipping 886 matching lines @@
   NetworkProperties connected_network_properties;
   DWORD error = GetConnectedProperties(&connected_network_properties);
   if (network_guid == connected_network_properties.guid &&
       connected_network_properties.connection_state ==
       onc::connection_state::kConnected) {
     DVLOG(1) << "WiFi Connected, Reset DHCP: " << network_guid;
     // Even though wireless network is now connected, it may still be unusable,
     // e.g. after Chromecast device reset. Reset DHCP on wireless network to
     // work around this issue.
     error = ResetDHCP();
+    if (error != ERROR_SUCCESS)
+      LOG(ERROR) << error;

[afontan, 2014/04/23 21:04:16]

You are logging it twice as ResetDHCP already logs the error.

[mef, 2014/04/23 21:41:23]

Done.

     // There is no need to keep created profile as network is connected.
     created_profiles_.RemoveWithoutPathExpansion(network_guid, NULL);
     // Restore previously suppressed notifications.
     enable_notify_network_changed_ = true;
     RestoreNwCategoryWizard();
     NotifyNetworkChanged(network_guid);
   } else {
     // Continue waiting for network connection state change.
     task_runner_->PostDelayedTask(
         FROM_HERE,
@@ skipping 45 matching lines @@
 }
 
 void WiFiServiceImpl::SortNetworks(NetworkList* networks) {
   networks->sort(NetworkProperties::OrderByType);
 }
 
 DWORD WiFiServiceImpl::LoadWlanLibrary() {
   // Use an absolute path to load the DLL to avoid DLL preloading attacks.
   base::FilePath path;
   if (!PathService::Get(base::DIR_SYSTEM, &path)) {
-    DLOG(ERROR) << "Unable to get system path.";
+    LOG(ERROR) << "Unable to get system path.";
     return ERROR_NOT_FOUND;
   }
   wlan_api_library_ = ::LoadLibraryEx(path.Append(kWlanApiDll).value().c_str(),
                                       NULL,
                                       LOAD_WITH_ALTERED_SEARCH_PATH);
   if (!wlan_api_library_) {
-    DLOG(ERROR) << "Unable to load WlanApi.dll.";
+    LOG(ERROR) << "Unable to load WlanApi.dll.";
     return ERROR_NOT_FOUND;
   }
 
   // Initialize WlanApi function pointers
   WlanConnect_function_ =
       reinterpret_cast<WlanConnectFunction>(
           ::GetProcAddress(wlan_api_library_, kWlanConnect));
   WlanCloseHandle_function_ =
       reinterpret_cast<WlanCloseHandleFunction>(
           ::GetProcAddress(wlan_api_library_, kWlanCloseHandle));
@@ skipping 43 matching lines @@
       !WlanDisconnect_function_ ||
       !WlanEnumInterfaces_function_ ||
       !WlanFreeMemory_function_ ||
       !WlanGetAvailableNetworkList_function_ ||
       !WlanGetProfile_function_ ||
       !WlanOpenHandle_function_ ||
       !WlanQueryInterface_function_ ||
       !WlanRegisterNotification_function_ ||
       !WlanScan_function_ ||
       !WlanSetProfile_function_) {
-    DLOG(ERROR) << "Unable to find required WlanApi function.";
+    LOG(ERROR) << "Unable to find required WlanApi function.";
     FreeLibrary(wlan_api_library_);
     wlan_api_library_ = NULL;
     return ERROR_NOT_FOUND;
   }
 
   // Some WlanApi functions may not be available on XP.
   if (!WlanGetNetworkBssList_function_ ||
       !WlanSaveTemporaryProfile_function_) {
     DVLOG(1) << "WlanApi function is not be available on XP.";
   }
@@ skipping 35 matching lines @@
     // Clean up..
     if (interface_list != NULL)
       WlanFreeMemory_function_(interface_list);
   }
   return error;
 }
 
 DWORD WiFiServiceImpl::ResetDHCP() {
   IP_ADAPTER_INDEX_MAP adapter_index_map = {0};
   DWORD error = FindAdapterIndexMapByGUID(interface_guid_, &adapter_index_map);
-  if (error == ERROR_SUCCESS) {
-    error = ::IpReleaseAddress(&adapter_index_map);
-    if (error == ERROR_SUCCESS) {
-      error = ::IpRenewAddress(&adapter_index_map);
+  if (error != ERROR_SUCCESS) {
+    LOG(ERROR) << error;
+    return error;
+  }
+  error = ::IpReleaseAddress(&adapter_index_map);
+  if (error != ERROR_SUCCESS) {
+    if (error != ERROR_ADDRESS_NOT_ASSOCIATED) {
+      LOG(ERROR) << error;
+      return error;
     }
+    DVLOG(1) << "Ignoring IpReleaseAddress Error: " << error;
   }
+  error = ::IpRenewAddress(&adapter_index_map);
+  if (error != ERROR_SUCCESS)
+    LOG(ERROR) << error;
   return error;
 }
 
 DWORD WiFiServiceImpl::FindAdapterIndexMapByGUID(
     const GUID& interface_guid,
     IP_ADAPTER_INDEX_MAP* adapter_index_map) {
   base::string16 guid_string;
   const int kGUIDSize = 39;
   ::StringFromGUID2(
       interface_guid, WriteInto(&guid_string, kGUIDSize), kGUIDSize);
@@ skipping 703 matching lines @@
     NetworkGuidList changed_networks(1, network_guid);
     message_loop_proxy_->PostTask(
         FROM_HERE,
         base::Bind(networks_changed_observer_, changed_networks));
   }
 }
 
 WiFiService* WiFiService::Create() { return new WiFiServiceImpl(); }
 
 }  // namespace wifi