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

webrtc/base/virtualsocketserver.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 268 matching lines @@
       server_->msg_queue_->Get(&msg);
       server_->msg_queue_->Dispatch(&msg);
     }
   }
 
   // Return the packet at the front of the queue.
   Packet* packet = recv_buffer_.front();
   size_t data_read = std::min(cb, packet->size());
   memcpy(pv, packet->data(), data_read);
   *paddr = packet->from();
+  // HACK(any_address): when the incoming packet is from a binding of the any

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

Can this be done on the send side? i.e. in AddPacketToNetwork?

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

I was thinking the same thing.  That would be more clear to me.

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

Done.

+  // address, translate it to the default interface here such that the STUN
+  // server will see a valid interface.
+  if (paddr->IsAnyIP()) {
+    *paddr = server_->TryMapAnyAddressToDefault(*paddr);
+  }
 
   if (data_read < packet->size()) {
     packet->Consume(data_read);
   } else {
     recv_buffer_.pop_front();
     delete packet;
   }
 
   if (SOCK_STREAM == type_) {
     bool was_full = (recv_buffer_size_ == server_->recv_buffer_capacity_);
@@ skipping 355 matching lines @@
     }
   }
 
   return Bind(socket, *addr);
 }
 
 VirtualSocket* VirtualSocketServer::LookupBinding(const SocketAddress& addr) {
   SocketAddress normalized(addr.ipaddr().Normalized(),
                            addr.port());
   AddressMap::iterator it = bindings_->find(normalized);
-  return (bindings_->end() != it) ? it->second : NULL;
+  VirtualSocket* socket = (bindings_->end() != it) ? it->second : NULL;
+  if (socket || addr.ipaddr() != default_interface(addr.ipaddr().family())) {
+    return socket;
+  }
+
+  // HACK(any_address): If we can't find a binding, maybe this is resulted from

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

Is this still needed if we do the change I suggest above?

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

yes, since the binding of the default route just doesn't exist.

+  // RecvFrom where we translate the any address to the default interface.
+  SocketAddress sock_addr =
+      EmptySocketAddressWithFamily(addr.ipaddr().family());
+  sock_addr.SetPort(addr.port());
+  return LookupBinding(sock_addr);
 }
 
 int VirtualSocketServer::Unbind(const SocketAddress& addr,
                                 VirtualSocket* socket) {
   SocketAddress normalized(addr.ipaddr().Normalized(),
                            addr.port());
   ASSERT((*bindings_)[normalized] == socket);
   bindings_->erase(bindings_->find(normalized));
   return 0;
 }
@@ skipping 398 matching lines @@
   if (local_ip.family() == AF_INET6 && local->was_any()) {
     return true;
   }
   if (remote_ip.family() == AF_INET6 && remote->was_any()) {
     return true;
   }
 
   return false;
 }
 
+const SocketAddress VirtualSocketServer::TryMapAnyAddressToDefault(

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

I think a better name would be GetDefaultRouteIfNecessary

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

Done.

+    const SocketAddress& addr) {
+  IPAddress default_ip = default_interface(addr.ipaddr().family());
+  if (!addr.IsAnyIP() || IPIsUnspec(default_ip)) {
+    return addr;
+  }
+  SocketAddress address = addr;
+  address.SetIP(default_ip);
+  return address;
+}
+
 }  // namespace rtc