Connection resurrected with incorrect candidate type.

webrtc/p2p/base/p2ptransportchannel.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 460 matching lines @@
     }
   }
 
   // The STUN binding request may arrive after setRemoteDescription and before
   // adding remote candidate, so we need to set the password to the shared
   // password if the user name matches.
   if (remote_password.empty() && remote_username == remote_ice_ufrag_) {
     remote_password = remote_ice_pwd_;
   }
 
-  Candidate new_remote_candidate;
+  Candidate remote_candidate;
+  bool remote_candidate_is_new = false;

[pthatcher1, 2015/06/09 23:58:03]

Perhaps more clear as:

bool remote_candidate_is_new = (candidate == nullptr);
if (candidate_is_new) {
  ...
} else {
  ..
}

[guoweis_webrtc, 2015/06/10 18:12:41]

Done.

   if (candidate != NULL) {
-    new_remote_candidate = *candidate;
+    remote_candidate = *candidate;
     if (ufrag_per_port) {
-      new_remote_candidate.set_address(address);
+      remote_candidate.set_address(address);
     }
   } else {
+    remote_candidate_is_new = true;
     // Create a new candidate with this address.
     std::string type;
     if (port->IceProtocol() == ICEPROTO_RFC5245) {
       type = PRFLX_PORT_TYPE;
     } else {
       // G-ICE doesn't support prflx candidate.
       // We set candidate type to STUN_PORT_TYPE if the binding request comes
       // from a relay port or the shared socket is used. Otherwise we use the
       // port's type as the candidate type.
       if (port->Type() == RELAY_PORT_TYPE || port->SharedSocket()) {
         type = STUN_PORT_TYPE;
       } else {
         type = port->Type();
       }
     }
 
-    new_remote_candidate =
+    remote_candidate =
         Candidate(component(), ProtoToString(proto), address, 0,
                   remote_username, remote_password, type, 0U, "");
 
     // From RFC 5245, section-7.2.1.3:
     // The foundation of the candidate is set to an arbitrary value, different
     // from the foundation for all other remote candidates.
-    new_remote_candidate.set_foundation(
-        rtc::ToString<uint32>(rtc::ComputeCrc32(new_remote_candidate.id())));
+    remote_candidate.set_foundation(
+        rtc::ToString<uint32>(rtc::ComputeCrc32(remote_candidate.id())));
 
-    new_remote_candidate.set_priority(new_remote_candidate.GetPriority(
+    remote_candidate.set_priority(remote_candidate.GetPriority(
         ICE_TYPE_PREFERENCE_PRFLX, port->Network()->preference(), 0));
   }
 
   if (port->IceProtocol() == ICEPROTO_RFC5245) {
     // RFC 5245
     // If the source transport address of the request does not match any
     // existing remote candidates, it represents a new peer reflexive remote
     // candidate.
 
     // The priority of the candidate is set to the PRIORITY attribute
     // from the request.
     const StunUInt32Attribute* priority_attr =
         stun_msg->GetUInt32(STUN_ATTR_PRIORITY);
     if (!priority_attr) {
       LOG(LS_WARNING) << "P2PTransportChannel::OnUnknownAddress - "
                       << "No STUN_ATTR_PRIORITY found in the "
                       << "stun request message";
       port->SendBindingErrorResponse(stun_msg, address,
                                      STUN_ERROR_BAD_REQUEST,
                                      STUN_ERROR_REASON_BAD_REQUEST);
       return;
     }
-    new_remote_candidate.set_priority(priority_attr->value());
+    if (remote_candidate_is_new) {
+      remote_candidate.set_priority(priority_attr->value());
+    }

[pthatcher1, 2015/06/09 23:58:03]

Can you move this up into the rest of the "remote_candidate_is_new" code?  That
way we'll have one set_priority instead of two:

if (port->IceProtocol() == ICEPROTO_RFC5245) {
  ...
  remote_candidate.set_priority(priority_attr->value())
} else {
  remote_candidate.set_priority(remote_candidate.GetPriority(
    ICE_TYPE_PREFERENCE_PRFLX, port->Network()->preference(), 0));
}

[guoweis_webrtc, 2015/06/10 18:12:41]

Done.

 
     // RFC5245, the agent constructs a pair whose local candidate is equal to
     // the transport address on which the STUN request was received, and a
     // remote candidate equal to the source transport address where the
     // request came from.
 
     // There shouldn't be an existing connection with this remote address.
     // When ports are muxed, this channel might get multiple unknown address
     // signals. In that case if the connection is already exists, we should
     // simply ignore the signal othewise send server error.
-    if (port->GetConnection(new_remote_candidate.address())) {
+    if (port->GetConnection(remote_candidate.address())) {
       if (port_muxed) {
         LOG(LS_INFO) << "Connection already exists for peer reflexive "
-                     << "candidate: " << new_remote_candidate.ToString();
+                     << "candidate: " << remote_candidate.ToString();
         return;
       } else {
         ASSERT(false);
         port->SendBindingErrorResponse(stun_msg, address,
                                        STUN_ERROR_SERVER_ERROR,
                                        STUN_ERROR_REASON_SERVER_ERROR);
         return;
       }
     }
 
     Connection* connection = port->CreateConnection(
-        new_remote_candidate, cricket::PortInterface::ORIGIN_THIS_PORT);
+        remote_candidate, cricket::PortInterface::ORIGIN_THIS_PORT);
     if (!connection) {
       ASSERT(false);
       port->SendBindingErrorResponse(stun_msg, address,
                                      STUN_ERROR_SERVER_ERROR,
                                      STUN_ERROR_REASON_SERVER_ERROR);
       return;
     }
 
-    LOG(LS_INFO) << "Adding connection from peer reflexive candidate: "
-                 << new_remote_candidate.ToString();
+    LOG(LS_INFO) << "Adding connection from "
+                 << (remote_candidate_is_new ? "peer reflexive" : "resurrected")
+                 << " candidate: " << remote_candidate.ToString();
     AddConnection(connection);
     connection->ReceivedPing();
 
     // Send the pinger a successful stun response.
     port->SendBindingResponse(stun_msg, address);
 
     // Update the list of connections since we just added another.  We do this
     // after sending the response since it could (in principle) delete the
     // connection in question.
     SortConnections();
   } else {
     // Check for connectivity to this address. Create connections
     // to this address across all local ports. First, add this as a new remote
     // address
-    if (!CreateConnections(new_remote_candidate, port, true)) {
+    if (!CreateConnections(remote_candidate, port, true)) {
       // Hopefully this won't occur, because changing a destination address
       // shouldn't cause a new connection to fail
       ASSERT(false);
       port->SendBindingErrorResponse(stun_msg, address, STUN_ERROR_SERVER_ERROR,
           STUN_ERROR_REASON_SERVER_ERROR);
       return;
     }
 
     // Send the pinger a successful stun response.
     port->SendBindingResponse(stun_msg, address);
@@ skipping 769 matching lines @@
   SignalReadPacket(this, data, len, packet_time, 0);
 }
 
 void P2PTransportChannel::OnReadyToSend(Connection* connection) {
   if (connection == best_connection_ && writable()) {
     SignalReadyToSend(this);
   }
 }
 
 }  // namespace cricket