Bind a socket to a network if the network handle is set.

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 353 matching lines @@
   }
   return false;
 }
 
 BasicNetworkManager::BasicNetworkManager()
     : thread_(NULL), sent_first_update_(false), start_count_(0),
       ignore_non_default_routes_(false) {
 }
 
 BasicNetworkManager::~BasicNetworkManager() {
+  if (thread_ && network_monitor_ &&
+      thread_->socketserver()->network_binder() == network_monitor_.get()) {
+    // In case that network binder is still being used by the socket server
+    // after it is released here.
+    thread_->socketserver()->set_network_binder(nullptr);
+  }
 }
 
 void BasicNetworkManager::OnNetworksChanged() {
   LOG(LS_VERBOSE) << "Network change was observed at the network manager";
   UpdateNetworksOnce();
 }
 
 #if defined(__native_client__)
 
 bool BasicNetworkManager::CreateNetworks(bool include_ignored,
@@ skipping 340 matching lines @@
     sent_first_update_ = false;
     StopNetworkMonitor();
   }
 }
 
 void BasicNetworkManager::StartNetworkMonitor() {
   NetworkMonitorFactory* factory = NetworkMonitorFactory::GetFactory();
   if (factory == nullptr) {
     return;
   }
-  network_monitor_.reset(factory->CreateNetworkMonitor());
   if (!network_monitor_) {
-    return;
+    network_monitor_.reset(factory->CreateNetworkMonitor());
+    ASSERT(network_monitor_);
+    ASSERT(thread_ && thread_->socketserver());
+    thread_->socketserver()->set_network_binder(network_monitor_.get());

[pthatcher1, 2016/01/15 19:56:11]

While much less complex than before (which is good), this is still somewhat
magic behavior.  I'd like to think about this some more.

   }
+
   network_monitor_->SignalNetworksChanged.connect(
       this, &BasicNetworkManager::OnNetworksChanged);
   network_monitor_->Start();
 }
 
 void BasicNetworkManager::StopNetworkMonitor() {
   if (!network_monitor_) {
     return;
   }
   network_monitor_->Stop();
-  network_monitor_.reset();
 }
 
 void BasicNetworkManager::OnMessage(Message* msg) {
   switch (msg->message_id) {
     case kUpdateNetworksMessage: {
       UpdateNetworksContinually();
       break;
     }
     case kSignalNetworksMessage:  {
       SignalNetworksChanged();
@@ skipping 153 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