NetworkChangeNotifierChromeos: Handle IPConfig property changes on the default network

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/values.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
+namespace {
+
+bool ConvertListValueToStringVector(const base::ListValue& string_list,
+                                    std::vector<std::string>* result) {
+  for (size_t i = 0; i < string_list.GetSize(); ++i) {
+    std::string str;
+    if (!string_list.GetString(i, &str))
+      return false;
+    result->push_back(str);
+  }
+  return true;
+}
+
+}  // namespace
+
 namespace chromeos {
 
 NetworkState::NetworkState(const std::string& path)
     : ManagedState(MANAGED_TYPE_NETWORK, path),
       signal_strength_(0) {
 }
 
 NetworkState::~NetworkState() {
 }
 
 bool NetworkState::PropertyChanged(const std::string& key,
                                    const base::Value& value) {
   // Keep care that these properties are the same as in |GetProperties|.
   if (ManagedStatePropertyChanged(key, value))
     return true;
   if (key == flimflam::kSignalStrengthProperty) {
     return GetIntegerValue(key, value, &signal_strength_);
   } else if (key == flimflam::kStateProperty) {
     return GetStringValue(key, value, &connection_state_);
   } else if (key == flimflam::kErrorProperty) {
     return GetStringValue(key, value, &error_);
+  } else if (key == flimflam::kAddressProperty) {
+    return GetStringValue(key, value, &ip_address_);
+  } else if (key == flimflam::kNameServersProperty) {
+    dns_servers_.clear();
+    const base::ListValue* dns_servers;
+    if (value.GetAsList(&dns_servers) &&
+        ConvertListValueToStringVector(*dns_servers, &dns_servers_))
+      return true;
   } else if (key == flimflam::kActivationStateProperty) {
     return GetStringValue(key, value, &activation_state_);
   } else if (key == flimflam::kRoamingStateProperty) {
     return GetStringValue(key, value, &roaming_);
   } else if (key == flimflam::kSecurityProperty) {
     return GetStringValue(key, value, &security_);
   } else if (key == flimflam::kNetworkTechnologyProperty) {
     return GetStringValue(key, value, &technology_);
   } else if (key == flimflam::kDeviceProperty) {
     return GetStringValue(key, value, &device_path_);
@@ skipping 10 matching lines @@
 void NetworkState::GetProperties(base::DictionaryValue* dictionary) const {
   // Keep care that these properties are the same as in |PropertyChanged|.
   dictionary->SetStringWithoutPathExpansion(flimflam::kNameProperty, name());
   dictionary->SetStringWithoutPathExpansion(flimflam::kTypeProperty, type());
   dictionary->SetIntegerWithoutPathExpansion(flimflam::kSignalStrengthProperty,
                                              signal_strength());
   dictionary->SetStringWithoutPathExpansion(flimflam::kStateProperty,
                                             connection_state());
   dictionary->SetStringWithoutPathExpansion(flimflam::kErrorProperty,
                                             error());
+  dictionary->SetStringWithoutPathExpansion(flimflam::kAddressProperty,

[pneubeck (no reviews), 2013/03/29 19:16:53]

My veto here:

The only usage for this function is to obtain a correct subset of a Shill
dictionary which can be translated to "extended" ONC. The result is then
returned by GetState/GetVisibleNetworks of the extension API.
I will not accept to add yet another conditional translation for these new keys.

I see two alternatives which I'm fine with:

- Either remove these two dictionary->Set..  and adapt the comment (that this
function returns only a subset of the properties accepted by Property changed).
This is ok, because we don't have any user of these properties through the
extension API, yet.

- Or make it a correct Shill (nested) dictionary. That was my 1st proposal: A
shill service has a property IPConfig and that in turn has Address and
NameServers.

[stevenjb, 2013/03/29 19:41:25]

OK, now I understand the concern, and agree that this makes sense, lets go with
Philipp's second suggestion.

[gauravsh, 2013/04/01 20:02:06]

Done.

+                                            ip_address());
+  base::ListValue* value = new ListValue;
+  value->AppendStrings(dns_servers());
+  dictionary->SetWithoutPathExpansion(flimflam::kNameServersProperty,
+                                      value);

[stevenjb, 2013/03/29 00:52:10]

nit: one line?

[gauravsh, 2013/04/01 20:02:06]

Done.

   dictionary->SetStringWithoutPathExpansion(flimflam::kActivationStateProperty,
                                             activation_state());
   dictionary->SetStringWithoutPathExpansion(flimflam::kRoamingStateProperty,
                                             roaming());
   dictionary->SetStringWithoutPathExpansion(flimflam::kSecurityProperty,
                                             security());
   dictionary->SetStringWithoutPathExpansion(
       flimflam::kNetworkTechnologyProperty,
       technology());
   dictionary->SetStringWithoutPathExpansion(flimflam::kDeviceProperty,
@@ skipping 22 matching lines @@
 }
 
 // static
 bool NetworkState::StateIsConnecting(const std::string& connection_state) {
   return (connection_state == flimflam::kStateAssociation ||
           connection_state == flimflam::kStateConfiguration ||
           connection_state == flimflam::kStateCarrier);
 }
 
 }  // namespace chromeos