Add some additional network debugging code

chromeos/network/network_state_handler.cc

 // Copyright (c) 2012 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 "chromeos/network/network_state_handler.h"
 
 #include "base/bind.h"
 #include "base/format_macros.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
@@ skipping 53 matching lines @@
     value.GetAsDouble(&dval);
     return base::StringPrintf("%g", dval);
   } else if (value.GetType() == base::Value::TYPE_STRING) {
     std::string vstr;
     value.GetAsString(&vstr);
     return vstr;
   }
   return "";
 }
 
+bool ConnectionStateChanged(chromeos::NetworkState* network,
+                            const std::string& prev_connection_state) {
+  return (network->connection_state() != prev_connection_state) &&
+         (network->connection_state() != flimflam::kStateIdle ||
+          !prev_connection_state.empty());
+}
+
 }  // namespace
 
 namespace chromeos {
 
 const char NetworkStateHandler::kMatchTypeDefault[] = "default";
 const char NetworkStateHandler::kMatchTypeWireless[] = "wireless";
 const char NetworkStateHandler::kMatchTypeMobile[] = "mobile";
 const char NetworkStateHandler::kMatchTypeNonVirtual[] = "non-virtual";
 
 static NetworkStateHandler* g_network_state_handler = NULL;
@@ skipping 317 matching lines @@
   }
   managed->InitialPropertiesReceived();
   network_event_log::AddEntry(
       kLogModule, "PropertiesReceived",
       base::StringPrintf("%s (%s)", path.c_str(), managed->name().c_str()));
   // Notify observers.
   if (network_property_updated) {
     NetworkState* network = managed->AsNetworkState();
     DCHECK(network);
     // Signal connection state changed after all properties have been updated.
-    if (network->connection_state() != prev_connection_state)
+    if (ConnectionStateChanged(network, prev_connection_state))
       OnNetworkConnectionStateChanged(network);
     NetworkPropertiesUpdated(network);
   }
 }
 
 void NetworkStateHandler::UpdateNetworkServiceProperty(
     const std::string& service_path,
     const std::string& key,
     const base::Value& value) {
   NetworkState* network = GetModifiableNetworkState(service_path);
   if (!network)
     return;
   std::string prev_connection_state = network->connection_state();
   if (!network->PropertyChanged(key, value))
     return;
 
-  std::string detail = network->name() + "." + key;
-  std::string vstr = ValueAsString(value);
-  if (!vstr.empty())
-    detail += " = " + vstr;
-  network_event_log::AddEntry(kLogModule, "NetworkPropertyUpdated", detail);
-
-  if (network->connection_state() != prev_connection_state) {
-    OnNetworkConnectionStateChanged(network);
-  } else if (network->path() == default_network_path_ &&
-           key != flimflam::kSignalStrengthProperty) {
-    // WiFi signal strength updates are too noisy, so don't
-    // trigger default network updates for those changes.
-    OnDefaultNetworkChanged();
+  if (key == flimflam::kStateProperty) {
+    if (ConnectionStateChanged(network, prev_connection_state))
+      OnNetworkConnectionStateChanged(network);
+  } else {
+    if (network->path() == default_network_path_ &&
+        key != flimflam::kSignalStrengthProperty) {
+      // WiFi signal strength updates are too noisy, so don't
+      // trigger default network updates for those changes.
+      OnDefaultNetworkChanged();
+    }
+    std::string detail = network->name() + "." + key;
+    std::string vstr = ValueAsString(value);
+    if (!vstr.empty())
+      detail += " = " + vstr;
+    network_event_log::AddEntry(kLogModule, "NetworkPropertyUpdated", detail);
   }
-
   NetworkPropertiesUpdated(network);
 }
 
 void NetworkStateHandler::UpdateDeviceProperty(const std::string& device_path,
                                                const std::string& key,
                                                const base::Value& value) {
   DeviceState* device = GetModifiableDeviceState(device_path);
   if (!device)
     return;
   if (!device->PropertyChanged(key, value))
@@ skipping 160 matching lines @@
   }
   if (type == kMatchTypeDefault || type == kMatchTypeNonVirtual ||
       type == kMatchTypeWireless) {
     NOTREACHED();
     return flimflam::kTypeWifi;
   }
   return type;
 }
 
 }  // namespace chromeos