[CrOS Tether] Add the HasConnectedToHost network field to NetworkStateHandler.

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 <stddef.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 482 matching lines @@
 const NetworkState* NetworkStateHandler::GetNetworkStateFromGuid(
     const std::string& guid) const {
   DCHECK(!guid.empty());
   return GetModifiableNetworkStateFromGuid(guid);
 }
 
 void NetworkStateHandler::AddTetherNetworkState(const std::string& guid,
                                                 const std::string& name,
                                                 const std::string& carrier,
                                                 int battery_percentage,
-                                                int signal_strength) {
+                                                int signal_strength,
+                                                bool has_connected_to_host) {
   DCHECK(!guid.empty());
   DCHECK(battery_percentage >= 0 && battery_percentage <= 100);
   DCHECK(signal_strength >= 0 && signal_strength <= 100);
 
   if (tether_technology_state_ != TECHNOLOGY_ENABLED) {
     NET_LOG(ERROR) << "AddTetherNetworkState() called when Tether networks "
                    << "are not enabled. Cannot add NetworkState.";
     return;
   }
 
@@ skipping 10 matching lines @@
 
   tether_network_state->set_name(name);
   tether_network_state->set_type(kTypeTether);
   tether_network_state->SetGuid(guid);
   tether_network_state->set_visible(true);
   tether_network_state->set_update_received();
   tether_network_state->set_update_requested(false);
   tether_network_state->set_connectable(true);
   tether_network_state->set_carrier(carrier);
   tether_network_state->set_battery_percentage(battery_percentage);
-  // TODO(khorimoto): Add this field as a parameter to this function and set it
-  // accordingly from the Tether component.
-  tether_network_state->set_tether_has_connected_to_host(false);
+  tether_network_state->set_tether_has_connected_to_host(has_connected_to_host);
   tether_network_state->set_signal_strength(signal_strength);
 
   tether_network_list_.push_back(std::move(tether_network_state));
   NotifyNetworkListChanged();
 }
 
 bool NetworkStateHandler::UpdateTetherNetworkProperties(
     const std::string& guid,
     const std::string& carrier,
     int battery_percentage,
     int signal_strength) {
   if (tether_technology_state_ != TECHNOLOGY_ENABLED) {
     NET_LOG(ERROR) << "UpdateTetherNetworkProperties() called when Tether "
                    << "networks are not enabled. Cannot update.";
     return false;
   }
 
   NetworkState* tether_network_state = GetModifiableNetworkStateFromGuid(guid);
-  if (!tether_network_state)
+  if (!tether_network_state) {
+    NET_LOG(ERROR) << "UpdateTetherNetworkProperties() called for Tether "
+                   << "network with GUID " << guid << ", but this network is "
+                   << "not currently registered. Cannot update.";

[stevenjb, 2017/05/01 16:11:31]

nit: Very long messages like this in the log are a bit hard to read. The
file+line context is also provided, so I tend to prefer simpler messages, e.g.
"Update Tether Properties: No NetworkState for: " << GUID

[Kyle Horimoto, 2017/05/01 16:56:27]

Done.

     return false;
+  }
 
   tether_network_state->set_carrier(carrier);
   tether_network_state->set_battery_percentage(battery_percentage);
   tether_network_state->set_signal_strength(signal_strength);
 
   NotifyNetworkListChanged();
   return true;
 }
 
-void NetworkStateHandler::RemoveTetherNetworkState(const std::string& guid) {
+bool NetworkStateHandler::SetTetherNetworkHasConnectedToHost(
+    const std::string& guid) {
+  NetworkState* tether_network_state = GetModifiableNetworkStateFromGuid(guid);
+  if (!tether_network_state) {
+    NET_LOG(ERROR) << "SetTetherNetworkHasConnectedToHost() called for Tether "
+                   << "network which is not registered. GUID: " << guid;

[stevenjb, 2017/05/01 16:11:31]

ditto

[Kyle Horimoto, 2017/05/01 16:56:27]

Done.

+    return false;
+  }
+
+  bool old_tether_has_connected_to_host_value =
+      tether_network_state->tether_has_connected_to_host();
+  if (old_tether_has_connected_to_host_value) {
+    return false;
+  }

[stevenjb, 2017/05/01 16:11:31]

if (tether_network_state->tether_has_connected_to_host())
  return false;

[Kyle Horimoto, 2017/05/01 16:56:27]

Done.

+
+  tether_network_state->set_tether_has_connected_to_host(true);
+  NotifyNetworkListChanged();
+  return true;
+}
+
+bool NetworkStateHandler::RemoveTetherNetworkState(const std::string& guid) {
   for (auto iter = tether_network_list_.begin();
        iter != tether_network_list_.end(); ++iter) {
     if (iter->get()->AsNetworkState()->guid() == guid) {
       NetworkState* wifi_network = GetModifiableNetworkStateFromGuid(
           iter->get()->AsNetworkState()->tether_guid());
       if (wifi_network)
         wifi_network->set_tether_guid(std::string());
 
       tether_network_list_.erase(iter);
       NotifyNetworkListChanged();
-      return;
+      return true;
     }
   }
+
+  return false;
 }
 
 bool NetworkStateHandler::AssociateTetherNetworkStateWithWifiNetwork(
     const std::string& tether_network_guid,
     const std::string& wifi_network_guid) {
   if (tether_technology_state_ != TECHNOLOGY_ENABLED) {
     NET_LOG(ERROR) << "AssociateTetherNetworkStateWithWifiNetwork() called "
                    << "when Tether networks are not enabled. Cannot "
                    << "associate.";
     return false;
@@ skipping 831 matching lines @@
   if (type.MatchesType(shill::kTypeVPN))
     technologies.emplace_back(shill::kTypeVPN);
   if (type.MatchesType(kTypeTether))
     technologies.emplace_back(kTypeTether);
 
   CHECK_GT(technologies.size(), 0ul);
   return technologies;
 }
 
 }  // namespace chromeos