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

webrtc/base/physicalsocketserver.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.
  */
+#include "webrtc/base/physicalsocketserver.h"
 
 #if defined(_MSC_VER) && _MSC_VER < 1300
 #pragma warning(disable:4786)
 #endif
 
 #include <assert.h>
 
 #ifdef MEMORY_SANITIZER
 #include <sanitizer/msan_interface.h>
 #endif
@@ skipping 17 matching lines @@
 #endif
 
 #include <algorithm>
 #include <map>
 
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/byteorder.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
-#include "webrtc/base/physicalsocketserver.h"
 #include "webrtc/base/timeutils.h"
 #include "webrtc/base/winping.h"
 #include "webrtc/base/win32socketinit.h"
 
 // stm: this will tell us if we are on OSX
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #if defined(WEBRTC_POSIX)
@@ skipping 109 matching lines @@
   size_t len = bind_addr.ToSockAddrStorage(&addr_storage);
   sockaddr* addr = reinterpret_cast<sockaddr*>(&addr_storage);
   int err = ::bind(s_, addr, static_cast<int>(len));
   UpdateLastError();
 #if !defined(NDEBUG)
   if (0 == err) {
     dbg_addr_ = "Bound @ ";
     dbg_addr_.append(GetLocalAddress().ToString());
   }
 #endif
+  if (ss_->network_binder()) {
+    int result =
+        ss_->network_binder()->BindSocketToNetwork(s_, bind_addr.ipaddr());
+    if (result < 0) {
+      LOG(LS_INFO) << "Binding socket to network address "
+                   << bind_addr.ipaddr().ToString() << " result " << result;
+    }
+  }
   return err;
 }
 
 int PhysicalSocket::Connect(const SocketAddress& addr) {
   // TODO(pthatcher): Implicit creation is required to reconnect...
   // ...but should we make it more explicit?
   if (state_ != CS_CLOSED) {
     SetError(EALREADY);
     return SOCKET_ERROR;
   }
@@ skipping 915 matching lines @@
   virtual SOCKET GetSocket() {
     return INVALID_SOCKET;
   }
 
   virtual bool CheckSignalClose() { return false; }
 
 private:
   PhysicalSocketServer* ss_;
   WSAEVENT hev_;
 };
-#endif  // WEBRTC_WIN 
+#endif  // WEBRTC_WIN
 
 // Sets the value of a boolean value to false when signaled.
 class Signaler : public EventDispatcher {
  public:
   Signaler(PhysicalSocketServer* ss, bool* pf)
       : EventDispatcher(ss), pf_(pf) {
   }
   ~Signaler() override { }
 
   void OnEvent(uint32_t ff, int err) override {
@@ skipping 21 matching lines @@
   signal_dispatcher_.reset();
 #endif
   delete signal_wakeup_;
   ASSERT(dispatchers_.empty());
 }
 
 void PhysicalSocketServer::WakeUp() {
   signal_wakeup_->Signal();
 }
 
+void PhysicalSocketServer::MaybeSetNetworkBinder() {
+  if (NetworkMonitorFactory::GetFactory()) {
+    network_binder_ =
+        NetworkMonitorFactory::GetFactory()->GetOrCreateNetworkMonitor();
+  }

[pthatcher1, 2016/01/14 20:07:24]

I'm not sure if this is the best way to get it connected.  It requires changing
the ownership of the monitor, and it leads to a funny method call.  Why not just
have SetNetworkBinder() and let the caller pass in a NetworkMonitor?

[honghaiz3, 2016/01/15 01:00:38]

Removed this. Set Networkbinder from the network manager. 

+}
+
 Socket* PhysicalSocketServer::CreateSocket(int type) {
   return CreateSocket(AF_INET, type);
 }
 
 Socket* PhysicalSocketServer::CreateSocket(int family, int type) {
   PhysicalSocket* socket = new PhysicalSocket(this);
   if (socket->Create(family, type)) {
     return socket;
   } else {
     delete socket;
@@ skipping 432 matching lines @@
       break;
     cmsElapsed = TimeSince(msStart);
     if ((cmsWait != kForever) && (cmsElapsed >= cmsWait)) {
        break;
     }
   }
 
   // Done
   return true;
 }
-#endif  // WEBRTC_WIN 
+#endif  // WEBRTC_WIN
 
 }  // namespace rtc