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

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

Issue 2063823008: Adding IceConfig option to assume TURN/TURN candidate pairs will work. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Responding to comments. Doing "presumed writable" determination in Connection. 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
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 const IceConfig& config) {
257 if (!SupportsProtocol(address.protocol())) { 258 if (!SupportsProtocol(address.protocol())) {
258 return NULL; 259 return NULL;
259 } 260 }
260 261
261 if (!IsCompatibleAddress(address.address())) { 262 if (!IsCompatibleAddress(address.address())) {
262 return NULL; 263 return NULL;
263 } 264 }
264 265
265 if (SharedSocket() && Candidates()[0].type() != LOCAL_PORT_TYPE) { 266 if (SharedSocket() && Candidates()[0].type() != LOCAL_PORT_TYPE) {
266 ASSERT(false); 267 ASSERT(false);
267 return NULL; 268 return NULL;
268 } 269 }
269 270
270 Connection* conn = new ProxyConnection(this, 0, address); 271 Connection* conn = new ProxyConnection(this, 0, address, config);
271 AddOrReplaceConnection(conn); 272 AddOrReplaceConnection(conn);
272 return conn; 273 return conn;
273 } 274 }
274 275
275 int UDPPort::SendTo(const void* data, size_t size, 276 int UDPPort::SendTo(const void* data, size_t size,
276 const rtc::SocketAddress& addr, 277 const rtc::SocketAddress& addr,
277 const rtc::PacketOptions& options, 278 const rtc::PacketOptions& options,
278 bool payload) { 279 bool payload) {
279 int sent = socket_->SendTo(data, size, addr, options); 280 int sent = socket_->SendTo(data, size, addr, options);
280 if (sent < 0) { 281 if (sent < 0) {
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 const std::vector<Candidate>& existing_candidates = Candidates(); 508 const std::vector<Candidate>& existing_candidates = Candidates();
508 std::vector<Candidate>::const_iterator it = existing_candidates.begin(); 509 std::vector<Candidate>::const_iterator it = existing_candidates.begin();
509 for (; it != existing_candidates.end(); ++it) { 510 for (; it != existing_candidates.end(); ++it) {
510 if (it->address() == addr) 511 if (it->address() == addr)
511 return true; 512 return true;
512 } 513 }
513 return false; 514 return false;
514 } 515 }
515 516
516 } // namespace cricket 517 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698