Fix AllocationSequence to handle the case when TurnPort stops using shared socket.

webrtc/p2p/client/basicportallocator.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 1065 matching lines @@
 
   // Try to find the TurnPort that matches the remote address. Note that the
   // message could be a STUN binding response if the TURN server is also used as
   // a STUN server. We don't want to parse every message here to check if it is
   // a STUN binding response, so we pass the message to TurnPort regardless of
   // the message type. The TurnPort will just ignore the message since it will
   // not find any request by transaction ID.
   for (std::vector<TurnPort*>::const_iterator it = turn_ports_.begin();
        it != turn_ports_.end(); ++it) {
     TurnPort* port = *it;
-    if (port->server_address().address == remote_addr) {
+    if (port->SharedSocket() && port->server_address().address == remote_addr) {
       port->HandleIncomingPacket(socket, data, size, remote_addr, packet_time);
       turn_port_found = true;
       break;
     }
   }
 
   if (udp_port_) {
     const ServerAddresses& stun_servers = udp_port_->server_addresses();
 
     // Pass the packet to the UdpPort if there is no matching TurnPort, or if
     // the TURN server is also a STUN server.
     if (!turn_port_found ||
         stun_servers.find(remote_addr) != stun_servers.end()) {
+      RTP_DCHECK(udp_port_->SharedSocket());

[Irfan, 2016/04/18 21:53:12]

RTC_DCHECK ?

[Sergey Ulanov, 2016/04/18 22:35:14]

It's webrtc's version of DCHECK(). See webrtc/base/checks.h

[Irfan, 2016/04/18 22:42:43]

yes, I meant s/RTP_DCHECK/RTC_DCHECK

[Sergey Ulanov, 2016/04/18 23:02:44]

Done.

       udp_port_->HandleIncomingPacket(
           socket, data, size, remote_addr, packet_time);
     }
   }
 }
 
 void AllocationSequence::OnPortDestroyed(PortInterface* port) {
   if (udp_port_ == port) {
     udp_port_ = NULL;
     return;
@@ skipping 74 matching lines @@
   ServerAddresses servers;
   for (size_t i = 0; i < relays.size(); ++i) {
     if (relays[i].type == turn_type && SupportsProtocol(relays[i], type)) {
       servers.insert(relays[i].ports.front().address);
     }
   }
   return servers;
 }
 
 }  // namespace cricket