Provide IPConfigs in networkingPrivate.GetProperties

chromeos/network/device_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/device_state.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
+#include "chromeos/network/network_event_log.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 DeviceState::DeviceState(const std::string& path)
     : ManagedState(MANAGED_TYPE_DEVICE, path),
       allow_roaming_(false),
       provider_requires_roaming_(false),
       support_network_scan_(false),
       scanning_(false),
@@ skipping 104 matching lines @@
   return false;
 }
 
 bool DeviceState::InitialPropertiesReceived(
     const base::DictionaryValue& properties) {
   // Update UMA stats.
   if (sim_present_) {
     bool locked = !sim_lock_type_.empty();
     UMA_HISTOGRAM_BOOLEAN("Cellular.SIMLocked", locked);
   }
+  // IP Configs will be added when they are received.

[pneubeck (no reviews), 2014/05/05 21:09:28]

the comment doesn't explain why you have to clear it here.

[stevenjb, 2014/05/06 01:15:11]

Moved this logic and added a better comment.

+  ip_configs_.Clear();
   return false;
 }
 
+void DeviceState::IPConfigPropertiesChanged(
+    const std::string& ip_config_path,
+    const base::DictionaryValue& properties) {
+  base::DictionaryValue* ip_config;

[pneubeck (no reviews), 2014/05/05 21:09:28]

nit: initialize with NULL

[stevenjb, 2014/05/06 01:15:11]

Done.

+  if (ip_configs_.GetDictionaryWithoutPathExpansion(
+          ip_config_path, &ip_config)) {
+    NET_LOG_EVENT("IPConfig Updated: " + ip_config_path, path());
+    ip_config->Clear();
+  } else {
+    NET_LOG_EVENT("IPConfig Added: " + ip_config_path, path());
+    ip_config = new base::DictionaryValue;
+    ip_configs_.SetWithoutPathExpansion(ip_config_path, ip_config);
+  }
+  ip_config->MergeDictionary(&properties);
+}
+
 std::string DeviceState::GetFormattedMacAddress() const {
   if (mac_address_.size() % 2 != 0)
     return mac_address_;
   std::string result;
   for (size_t i = 0; i < mac_address_.size(); ++i) {
     if ((i != 0) && (i % 2 == 0))
       result.push_back(':');
     result.push_back(mac_address_[i]);
   }
   return result;
 }
 
 bool DeviceState::IsSimAbsent() const {
   return technology_family_ == shill::kTechnologyFamilyGsm && !sim_present_;
 }
 
 }  // namespace chromeos