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

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

Issue 2018693002: Create a new connection if a candidate reuses an address (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: address comments Created 4 years, 6 months 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/relayport.cc ('k') | webrtc/p2p/base/tcpport.cc » ('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 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 if (!IsCompatibleAddress(address.address())) { 261 if (!IsCompatibleAddress(address.address())) {
262 return NULL; 262 return NULL;
263 } 263 }
264 264
265 if (SharedSocket() && Candidates()[0].type() != LOCAL_PORT_TYPE) { 265 if (SharedSocket() && Candidates()[0].type() != LOCAL_PORT_TYPE) {
266 ASSERT(false); 266 ASSERT(false);
267 return NULL; 267 return NULL;
268 } 268 }
269 269
270 Connection* conn = new ProxyConnection(this, 0, address); 270 Connection* conn = new ProxyConnection(this, 0, address);
271 AddConnection(conn); 271 AddOrReplaceConnection(conn);
272 return conn; 272 return conn;
273 } 273 }
274 274
275 int UDPPort::SendTo(const void* data, size_t size, 275 int UDPPort::SendTo(const void* data, size_t size,
276 const rtc::SocketAddress& addr, 276 const rtc::SocketAddress& addr,
277 const rtc::PacketOptions& options, 277 const rtc::PacketOptions& options,
278 bool payload) { 278 bool payload) {
279 int sent = socket_->SendTo(data, size, addr, options); 279 int sent = socket_->SendTo(data, size, addr, options);
280 if (sent < 0) { 280 if (sent < 0) {
281 error_ = socket_->GetError(); 281 error_ = socket_->GetError();
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 const std::vector<Candidate>& existing_candidates = Candidates(); 507 const std::vector<Candidate>& existing_candidates = Candidates();
508 std::vector<Candidate>::const_iterator it = existing_candidates.begin(); 508 std::vector<Candidate>::const_iterator it = existing_candidates.begin();
509 for (; it != existing_candidates.end(); ++it) { 509 for (; it != existing_candidates.end(); ++it) {
510 if (it->address() == addr) 510 if (it->address() == addr)
511 return true; 511 return true;
512 } 512 }
513 return false; 513 return false;
514 } 514 }
515 515
516 } // namespace cricket 516 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/p2p/base/relayport.cc ('k') | webrtc/p2p/base/tcpport.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698