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/relayport.cc

Issue 2590153002: Revert of Add disabled certificate check support to IceServer PeerConnection API. (Closed)
Patch Set: Created 4 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/portallocator.h ('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 #include <algorithm> 10 #include <algorithm>
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 " @ " << ra->address.ToSensitiveString(); 484 " @ " << ra->address.ToSensitiveString();
485 485
486 rtc::AsyncPacketSocket* socket = NULL; 486 rtc::AsyncPacketSocket* socket = NULL;
487 487
488 if (ra->proto == PROTO_UDP) { 488 if (ra->proto == PROTO_UDP) {
489 // UDP sockets are simple. 489 // UDP sockets are simple.
490 socket = port_->socket_factory()->CreateUdpSocket( 490 socket = port_->socket_factory()->CreateUdpSocket(
491 rtc::SocketAddress(port_->ip(), 0), 491 rtc::SocketAddress(port_->ip(), 0),
492 port_->min_port(), port_->max_port()); 492 port_->min_port(), port_->max_port());
493 } else if (ra->proto == PROTO_TCP || ra->proto == PROTO_SSLTCP) { 493 } else if (ra->proto == PROTO_TCP || ra->proto == PROTO_SSLTCP) {
494 int opts = (ra->proto == PROTO_SSLTCP) 494 int opts = (ra->proto == PROTO_SSLTCP) ?
495 ? rtc::PacketSocketFactory::OPT_TLS_FAKE 495 rtc::PacketSocketFactory::OPT_SSLTCP : 0;
496 : 0;
497 socket = port_->socket_factory()->CreateClientTcpSocket( 496 socket = port_->socket_factory()->CreateClientTcpSocket(
498 rtc::SocketAddress(port_->ip(), 0), ra->address, 497 rtc::SocketAddress(port_->ip(), 0), ra->address,
499 port_->proxy(), port_->user_agent(), opts); 498 port_->proxy(), port_->user_agent(), opts);
500 } else { 499 } else {
501 LOG(LS_WARNING) << "Unknown protocol (" << ra->proto << ")"; 500 LOG(LS_WARNING) << "Unknown protocol (" << ra->proto << ")";
502 } 501 }
503 502
504 if (!socket) { 503 if (!socket) {
505 LOG(LS_WARNING) << "Socket creation failed"; 504 LOG(LS_WARNING) << "Socket creation failed";
506 } 505 }
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
838 if (rtc::TimeMillis() - start_time_ <= kRetryTimeout) 837 if (rtc::TimeMillis() - start_time_ <= kRetryTimeout)
839 entry_->ScheduleKeepAlive(); 838 entry_->ScheduleKeepAlive();
840 } 839 }
841 840
842 void AllocateRequest::OnTimeout() { 841 void AllocateRequest::OnTimeout() {
843 LOG(INFO) << "Allocate request timed out"; 842 LOG(INFO) << "Allocate request timed out";
844 entry_->HandleConnectFailure(connection_->socket()); 843 entry_->HandleConnectFailure(connection_->socket());
845 } 844 }
846 845
847 } // namespace cricket 846 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/p2p/base/portallocator.h ('k') | webrtc/p2p/base/tcpport.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698