Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(144)

Side by Side Diff: webrtc/p2p/base/stunport.cc

Issue 1516613002: Only try to pair protocol matching candidates for creating connections. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: merge Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/p2p/base/stunport.h ('k') | webrtc/p2p/base/tcpport.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 // prepare STUN candidate. 246 // prepare STUN candidate.
247 if (!server_addresses_.empty()) { 247 if (!server_addresses_.empty()) {
248 SendStunBindingRequests(); 248 SendStunBindingRequests();
249 } else { 249 } else {
250 // Port is done allocating candidates. 250 // Port is done allocating candidates.
251 MaybeSetPortCompleteOrError(); 251 MaybeSetPortCompleteOrError();
252 } 252 }
253 } 253 }
254 254
255 Connection* UDPPort::CreateConnection(const Candidate& address, 255 Connection* UDPPort::CreateConnection(const Candidate& address,
256 CandidateOrigin origin) { 256 CandidateOrigin origin) {
257 if (address.protocol() != "udp") 257 if (!SupportsProtocol(address.protocol())) {
258 return NULL; 258 return NULL;
259 }
259 260
260 if (!IsCompatibleAddress(address.address())) { 261 if (!IsCompatibleAddress(address.address())) {
261 return NULL; 262 return NULL;
262 } 263 }
263 264
264 if (SharedSocket() && Candidates()[0].type() != LOCAL_PORT_TYPE) { 265 if (SharedSocket() && Candidates()[0].type() != LOCAL_PORT_TYPE) {
265 ASSERT(false); 266 ASSERT(false);
266 return NULL; 267 return NULL;
267 } 268 }
268 269
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 const std::vector<Candidate>& existing_candidates = Candidates(); 505 const std::vector<Candidate>& existing_candidates = Candidates();
505 std::vector<Candidate>::const_iterator it = existing_candidates.begin(); 506 std::vector<Candidate>::const_iterator it = existing_candidates.begin();
506 for (; it != existing_candidates.end(); ++it) { 507 for (; it != existing_candidates.end(); ++it) {
507 if (it->address() == addr) 508 if (it->address() == addr)
508 return true; 509 return true;
509 } 510 }
510 return false; 511 return false;
511 } 512 }
512 513
513 } // namespace cricket 514 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/p2p/base/stunport.h ('k') | webrtc/p2p/base/tcpport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698