Create network change notifier.

webrtc/base/network.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 30 matching lines @@
 #if defined(WEBRTC_WIN)
 #include "webrtc/base/win32.h"
 #include <Iphlpapi.h>
 #endif
 
 #include <stdio.h>
 
 #include <algorithm>
 
 #include "webrtc/base/logging.h"
+#include "webrtc/base/networkchangenotifier.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/socket.h"  // includes something that makes windows happy
 #include "webrtc/base/stream.h"
 #include "webrtc/base/stringencode.h"
 #include "webrtc/base/thread.h"
 
 namespace rtc {
 namespace {
 
 // Turning on IPv6 could make many IPv6 interfaces available for connectivity
 // check and delay the call setup time. kMaxIPv6Networks is the default upper
 // limit of IPv6 networks but could be changed by set_max_ipv6_networks().
 const int kMaxIPv6Networks = 5;
 
 const uint32 kUpdateNetworksMessage = 1;

[pthatcher1, 2015/10/09 23:11:29]

Similarly, kUpdateNetworksContinuallyMessage

[honghaiz3, 2015/10/13 23:19:56]

I kept the message name because now I do not need to add a new message here. The
reason to move that message from here to the NetworkMonitor is to make the
NetwrkMonitor handle threading more safely. 

 const uint32 kSignalNetworksMessage = 2;
+const uint32 kUpdateNetworksOnceMessage = 3;
 
 // Fetch list of networks every two seconds.
 const int kNetworksUpdateIntervalMs = 2000;
 
 const int kHighestNetworkPreference = 127;
 
 typedef struct {
   Network* net;
   std::vector<InterfaceAddress> ips;
 } AddressList;
@@ skipping 245 matching lines @@
 
 BasicNetworkManager::BasicNetworkManager()
     : thread_(NULL), sent_first_update_(false), start_count_(0),
       network_ignore_mask_(kDefaultNetworkIgnoreMask),
       ignore_non_default_routes_(false) {
 }
 
 BasicNetworkManager::~BasicNetworkManager() {
 }
 
+void BasicNetworkManager::OnNetworkChangeNotified() {

[pthatcher1, 2015/10/09 23:11:29]

I think OnNetworksChanged would be a better name.

[honghaiz3, 2015/10/13 23:19:56]

Done.

+  LOG(LS_VERBOSE) << "Network change was notified at the network manager";
+  thread_->Post(this, kUpdateNetworksOnceMessage);
+}
+
 #if defined(__native_client__)
 
 bool BasicNetworkManager::CreateNetworks(bool include_ignored,
                                          NetworkList* networks) const {
   ASSERT(false);
   LOG(LS_WARNING) << "BasicNetworkManager doesn't work on NaCl yet";
   return false;
 }
 
 #elif defined(WEBRTC_POSIX)
@@ skipping 314 matching lines @@
 void BasicNetworkManager::StartUpdating() {
   thread_ = Thread::Current();
   if (start_count_) {
     // If network interfaces are already discovered and signal is sent,
     // we should trigger network signal immediately for the new clients
     // to start allocating ports.
     if (sent_first_update_)
       thread_->Post(this, kSignalNetworksMessage);
   } else {
     thread_->Post(this, kUpdateNetworksMessage);
+    StartNetworkChangeNotifier();
   }
   ++start_count_;
 }
 
 void BasicNetworkManager::StopUpdating() {
   ASSERT(Thread::Current() == thread_);
   if (!start_count_)
     return;
 
   --start_count_;
   if (!start_count_) {
     thread_->Clear(this);
     sent_first_update_ = false;
+    StopNetworkChangeNotifier();
   }
 }
 
+void BasicNetworkManager::StartNetworkChangeNotifier() {
+  NetworkChangeNotifierFactory* factory = NetworkChangeNotifier::GetFactory();
+  if (factory == nullptr) {
+    return;
+  }
+  network_change_notifier_.reset(factory->CreateNotifier());

[pthatcher1, 2015/10/09 23:11:29]

Why do we have GetFactory()->CreateNotifier()?  Why not just call
NetworkChangeNotifier::Create()?

[honghaiz3, 2015/10/13 23:19:56]

I keep the factory as it helps unittests and allow this class not calling
something in the webrtc_jni namespace in the rtc namespace.

+  if (!network_change_notifier_) {
+    return;
+  }
+  network_change_notifier_->SignalNetworksChanged.connect(
+      this, &BasicNetworkManager::OnNetworkChangeNotified);
+}
+
+void BasicNetworkManager::StopNetworkChangeNotifier() {
+  network_change_notifier_.reset();
+}
+
 void BasicNetworkManager::OnMessage(Message* msg) {
   switch (msg->message_id) {
     case kUpdateNetworksMessage:  {
+      UpdateNetworks();
+      break;
+    }
+    case kUpdateNetworksOnceMessage: {
       DoUpdateNetworks();
       break;
     }
     case kSignalNetworksMessage:  {
       SignalNetworksChanged();
       break;
     }
     default:
       ASSERT(false);
   }
 }
 
 void BasicNetworkManager::DoUpdateNetworks() {
   if (!start_count_)
     return;
 
   ASSERT(Thread::Current() == thread_);
 
   NetworkList list;
   if (!CreateNetworks(false, &list)) {
     SignalError();
   } else {
     bool changed;
     MergeNetworkList(list, &changed);
     if (changed || !sent_first_update_) {
       SignalNetworksChanged();
       sent_first_update_ = true;
     }
   }
+}
 
+void BasicNetworkManager::UpdateNetworks() {
+  DoUpdateNetworks();
   thread_->PostDelayed(kNetworksUpdateIntervalMs, this, kUpdateNetworksMessage);
 }
 
 void BasicNetworkManager::DumpNetworks(bool include_ignored) {
   NetworkList list;
   CreateNetworks(include_ignored, &list);
   LOG(LS_INFO) << "NetworkManager detected " << list.size() << " networks:";
   for (const Network* network : list) {
     if (!network->ignored() || include_ignored) {
       LOG(LS_INFO) << network->ToString() << ": "
@@ skipping 87 matching lines @@
   std::stringstream ss;
   // Print out the first space-terminated token of the network desc, plus
   // the IP address.
   ss << "Net[" << description_.substr(0, description_.find(' '))
      << ":" << prefix_.ToSensitiveString() << "/" << prefix_length_
      << ":" << AdapterTypeToString(type_) << "]";
   return ss.str();
 }
 
 }  // namespace rtc