Implement networkingPrivate.getNetworks

chromeos/network/network_state.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.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_profile_handler.h"
@@ skipping 112 matching lines @@
   return false;
 }
 
 bool NetworkState::InitialPropertiesReceived(
     const base::DictionaryValue& properties) {
   NET_LOG_DEBUG("InitialPropertiesReceived", path());
   bool changed = false;
   if (!properties.HasKey(shill::kTypeProperty)) {
     NET_LOG_ERROR("NetworkState has no type",
                   shill_property_util::GetNetworkIdFromProperties(properties));
-  } else {
-    changed |= UpdateName(properties);
+    return false;

[pneubeck (no reviews), 2014/05/15 18:28:37]

the return value is ignored by the caller.
in particular this seems not to lead to ignoring this state in the future
(set_update_received() is called unconditionally).

the best that might be feasible currently is to remove this state?

[stevenjb, 2014/05/15 20:12:41]

It is used in one of the places it gets called from, but not in the way that
might be expected (but it is documented). It returns whether or not a property
is changed.

On the one hand this shouldn't ever happen, but if it did I can't think off the
top of my head of anything that would break catastrophically, and I would just
as soon have the broken state available (in logs, etc) for debugging if it ever
did happen.

[pneubeck (no reviews), 2014/05/16 13:18:55]

Ops. My search was not exhaustive, sorry.
Yeah, let's wait for the error to appear.

   }
+  // Ensure that the network has a valid name.
+  changed |= UpdateName(properties);
+
+  // Set the ca_cert_nss_ property.

[pneubeck (no reviews), 2014/05/15 18:28:38]

ca_cert_nss_ -> has_ca_cert_nss_

[stevenjb, 2014/05/15 20:12:41]

Done.

   bool had_ca_cert_nss = has_ca_cert_nss_;
   has_ca_cert_nss_ = IsCaCertNssSet(properties);
   changed |= had_ca_cert_nss != has_ca_cert_nss_;
+
+  // By convention, all visible WiFi networks have a SignalStrength > 0.
+  if (type() == shill::kTypeWifi) {
+    if (signal_strength_ <= 0)
+      signal_strength_ = 1;
+  }
+
   return changed;
 }
 
 void NetworkState::GetStateProperties(base::DictionaryValue* dictionary) const {
   ManagedState::GetStateProperties(dictionary);
 
   // Properties shared by all types.
   dictionary->SetStringWithoutPathExpansion(shill::kGuidProperty, guid());
   dictionary->SetStringWithoutPathExpansion(shill::kStateProperty,
                                             connection_state());
@@ skipping 131 matching lines @@
           connection_state == shill::kStateCarrier);
 }
 
 // static
 bool NetworkState::ErrorIsValid(const std::string& error) {
   // Shill uses "Unknown" to indicate an unset or cleared error state.
   return !error.empty() && error != kErrorUnknown;
 }
 
 }  // namespace chromeos