commit a7c7a6bd21d4589eaf0d44e1195f5d5fc216bec1
author Vitaly Buka <vitalybuka@google.com> Wed Oct 28 13:12:34 2015 -0700
committer Vitaly Buka <vitalybuka@google.com> Thu Oct 29 05:54:22 2015 +0000
tree edd7b5101c5db011022330ce95786aa30b1ec23f
parent 3d8feaf206e4fc4e0e410800bc7c6aba9d983b14

Give network privider some time to figure out connectivity state

Implementation of network provider likely will start in offline state
and asynchronously discover state. If device has wired connection, it
should quickly switch to online state.

Change-Id: Ic4642a32c1f36eea2884287bc8372a020bb63eaa
Reviewed-on: https://weave-review.googlesource.com/1435
Reviewed-by: Vitaly Buka <vitalybuka@google.com>

libweave/src/privet/wifi_bootstrap_manager.cc

diff --git a/libweave/src/privet/wifi_bootstrap_manager.cc b/libweave/src/privet/wifi_bootstrap_manager.cc
index 255ae6b..4f46ea4 100644
--- a/libweave/src/privet/wifi_bootstrap_manager.cc
+++ b/libweave/src/privet/wifi_bootstrap_manager.cc
@@ -20,6 +20,8 @@
 
 namespace {
 
+const int kMonitoringTimeoutSeconds = 120;
+
 const EnumToStringMap<WifiBootstrapManager::State>::Map kWifiSetupStateMap[] = {
     {WifiBootstrapManager::State::kDisabled, "disabled"},
     {WifiBootstrapManager::State::kBootstrapping, "waiting"},
@@ -52,9 +54,10 @@
       base::Bind(&WifiBootstrapManager::OnConnectivityChange,
                  lifetime_weak_factory_.GetWeakPtr()));
   if (config_->GetSettings().last_configured_ssid.empty()) {
-    StartBootstrapping();
+    // Give implementation some time to figure out state.
+    StartMonitoring(base::TimeDelta::FromSeconds(15));
   } else {
-    StartMonitoring();
+    StartMonitoring(base::TimeDelta::FromSeconds(kMonitoringTimeoutSeconds));
   }
 }
 
@@ -65,7 +68,7 @@
     // testing when we have an ethernet connection.  If you need to always
     // start an AP to bootstrap WiFi credentials, then add your WiFi interface
     // to the device whitelist.
-    StartMonitoring();
+    StartMonitoring(base::TimeDelta::FromSeconds(kMonitoringTimeoutSeconds));
     return;
   }
 
@@ -106,7 +109,7 @@
 
 void WifiBootstrapManager::EndConnecting() {}
 
-void WifiBootstrapManager::StartMonitoring() {
+void WifiBootstrapManager::StartMonitoring(const base::TimeDelta& timeout) {
   VLOG(1) << "Monitoring connectivity.";
   // We already have a callback in place with |network_| to update our
   // connectivity state.  See OnConnectivityChange().
@@ -116,7 +119,7 @@
     monitor_until_ = {};
   } else {
     if (monitor_until_.is_null()) {
-      monitor_until_ = base::Time::Now() + base::TimeDelta::FromMinutes(2);
+      monitor_until_ = base::Time::Now() + timeout;
       VLOG(2) << "Waiting for connection until: " << monitor_until_;
     }
 
@@ -207,7 +210,7 @@
   change.set_last_configured_ssid(ssid);
   change.Commit();
   setup_state_ = SetupState{SetupState::kSuccess};
-  StartMonitoring();
+  StartMonitoring(base::TimeDelta::FromSeconds(kMonitoringTimeoutSeconds));
 }
 
 void WifiBootstrapManager::OnConnectTimeout() {
@@ -220,7 +223,7 @@
 
 void WifiBootstrapManager::OnBootstrapTimeout() {
   VLOG(1) << "Bootstrapping has timed out.";
-  StartMonitoring();
+  StartMonitoring(base::TimeDelta::FromSeconds(kMonitoringTimeoutSeconds));
 }
 
 void WifiBootstrapManager::OnConnectivityChange() {
@@ -231,7 +234,7 @@
   if (state_ == State::kMonitoring ||  // Reset monitoring timeout.
       (state_ != State::kDisabled &&
        network_->GetConnectionState() == Network::State::kOnline)) {
-    StartMonitoring();
+    StartMonitoring(base::TimeDelta::FromSeconds(kMonitoringTimeoutSeconds));
   }
 }
 

libweave/src/privet/wifi_bootstrap_manager.h

diff --git a/libweave/src/privet/wifi_bootstrap_manager.h b/libweave/src/privet/wifi_bootstrap_manager.h
index 4ff2d3e..71dbb49 100644
--- a/libweave/src/privet/wifi_bootstrap_manager.h
+++ b/libweave/src/privet/wifi_bootstrap_manager.h
@@ -73,7 +73,7 @@
   void StartConnecting(const std::string& ssid, const std::string& passphrase);
   void EndConnecting();
 
-  void StartMonitoring();
+  void StartMonitoring(const base::TimeDelta& timeout);
   void EndMonitoring();
 
   // Update the current state, post tasks to notify listeners accordingly to