Bug 4865: Enable connectivity when the remote peer is on public internet.

webrtc/base/virtualsocketserver.h

 /*
  *  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 25 matching lines @@
   explicit VirtualSocketServer(SocketServer* ss);
   ~VirtualSocketServer() override;
 
   SocketServer* socketserver() { return server_; }
 
   // Limits the network bandwidth (maximum bytes per second).  Zero means that
   // all sends occur instantly.  Defaults to 0.
   uint32 bandwidth() const { return bandwidth_; }
   void set_bandwidth(uint32 bandwidth) { bandwidth_ = bandwidth; }
 
+  // Default interface will be used when a binding is done against the any
+  // address.
+  const IPAddress default_interface(int family) {

[juberti1, 2015/08/06 00:35:26]

Style: if it takes arguments, it's usually not lowercase.

Suggest making this either GetDefaultInterface(family), and perhaps making it
private, or splitting these routines into
(set_)default_interface_v4/(set_)default_interface_v6

[pthatcher1, 2015/08/06 01:06:19]

I think this should be GetDefaultRoute.

[guoweis_webrtc, 2015/08/06 08:50:06]

Done.

+    if (family == AF_INET) {
+      return default_interface_v4_;
+    }
+    if (family == AF_INET6) {
+      return default_interface_v6_;
+    }
+    return IPAddress();
+  }
+  void set_default_interface(const IPAddress& ipaddr) {

[pthatcher1, 2015/08/06 01:06:19]

And this should be SetDefaultRoute.

+    if (ipaddr.family() == AF_INET) {
+      default_interface_v4_ = ipaddr;
+    } else if (ipaddr.family() == AF_INET6) {
+      default_interface_v6_ = ipaddr;
+    }
+  }
+
   // Limits the amount of data which can be in flight on the network without
   // packet loss (on a per sender basis).  Defaults to 64 KB.
   uint32 network_capacity() const { return network_capacity_; }
   void set_network_capacity(uint32 capacity) {
     network_capacity_ = capacity;
   }
 
   // The amount of data which can be buffered by tcp on the sender's side
   uint32 send_buffer_capacity() const { return send_buffer_capacity_; }
   void set_send_buffer_capacity(uint32 capacity) {
@@ skipping 61 matching lines @@
   // Close a pair of Tcp connections by addresses. Both connections will have
   // its own OnClose invoked.
   bool CloseTcpConnections(const SocketAddress& addr_local,
                            const SocketAddress& addr_remote);
 
  protected:
   // Returns a new IP not used before in this network.
   IPAddress GetNextIP(int family);
   uint16 GetNextPort();
 
+  // Helper function to return the binding from the any address to default
+  // interface.
+  const SocketAddress TryMapAnyAddressToDefault(const SocketAddress& addr);
+
   VirtualSocket* CreateSocketInternal(int family, int type);
 
   // Binds the given socket to addr, assigning and IP and Port if necessary
   int Bind(VirtualSocket* socket, SocketAddress* addr);
 
   // Binds the given socket to the given (fully-defined) address.
   int Bind(VirtualSocket* socket, const SocketAddress& addr);
 
   // Find the socket bound to the given address
   VirtualSocket* LookupBinding(const SocketAddress& addr);
@@ skipping 80 matching lines @@
   bool server_owned_;
   MessageQueue* msg_queue_;
   bool stop_on_idle_;
   uint32 network_delay_;
   in_addr next_ipv4_;
   in6_addr next_ipv6_;
   uint16 next_port_;
   AddressMap* bindings_;
   ConnectionMap* connections_;
 
+  IPAddress default_interface_v4_;
+  IPAddress default_interface_v6_;

[pthatcher1, 2015/08/06 01:06:19]

And this default_route_vX_;

+
   uint32 bandwidth_;
   uint32 network_capacity_;
   uint32 send_buffer_capacity_;
   uint32 recv_buffer_capacity_;
   uint32 delay_mean_;
   uint32 delay_stddev_;
   uint32 delay_samples_;
   Function* delay_dist_;
   CriticalSection delay_crit_;
 
   double drop_prob_;
   DISALLOW_COPY_AND_ASSIGN(VirtualSocketServer);
 };
 
 // Implements the socket interface using the virtual network.  Packets are
 // passed as messages using the message queue of the socket server.
 class VirtualSocket : public AsyncSocket, public MessageHandler {
  public:
   VirtualSocket(VirtualSocketServer* server, int family, int type, bool async);
   ~VirtualSocket() override;
 
   SocketAddress GetLocalAddress() const override;
   SocketAddress GetRemoteAddress() const override;
 
-  // Used by server sockets to set the local address without binding.
-  void SetLocalAddress(const SocketAddress& addr);
-
   // Used by TurnPortTest to mimic a case where proxy returns local host address
   // instead of the original one TurnPort was bound against. Please see WebRTC
   // issue 3927 for more detail.
   void SetAlternativeLocalAddress(const SocketAddress& addr);
 
   int Bind(const SocketAddress& addr) override;
   int Connect(const SocketAddress& addr) override;
   int Close() override;
   int Send(const void* pv, size_t cb) override;
   int SendTo(const void* pv, size_t cb, const SocketAddress& addr) override;
@@ skipping 26 matching lines @@
   typedef std::deque<NetworkEntry> NetworkQueue;
   typedef std::vector<char> SendBuffer;
   typedef std::list<Packet*> RecvBuffer;
   typedef std::map<Option, int> OptionsMap;
 
   int InitiateConnect(const SocketAddress& addr, bool use_delay);
   void CompleteConnect(const SocketAddress& addr, bool notify);
   int SendUdp(const void* pv, size_t cb, const SocketAddress& addr);
   int SendTcp(const void* pv, size_t cb);
 
+  // Used by server sockets to set the local address without binding.
+  void SetLocalAddress(const SocketAddress& addr);
+
   VirtualSocketServer* server_;
   int family_;
   int type_;
   bool async_;
   ConnState state_;
   int error_;
   SocketAddress local_addr_;
   SocketAddress alternative_local_addr_;
   SocketAddress remote_addr_;
 
@@ skipping 27 matching lines @@
 
   // Store the options that are set
   OptionsMap options_map_;
 
   friend class VirtualSocketServer;
 };
 
 }  // namespace rtc
 
 #endif  // WEBRTC_BASE_VIRTUALSOCKETSERVER_H_