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

Side by Side Diff: webrtc/api/peerconnection.cc

Issue 2590153002: Revert of Add disabled certificate check support to IceServer PeerConnection API. (Closed)
Patch Set: Created 3 years, 12 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 | « no previous file | webrtc/api/peerconnection_unittest.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 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 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 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 return false; 299 return false;
300 } 300 }
301 301
302 switch (service_type) { 302 switch (service_type) {
303 case STUN: 303 case STUN:
304 case STUNS: 304 case STUNS:
305 stun_servers->insert(rtc::SocketAddress(address, port)); 305 stun_servers->insert(rtc::SocketAddress(address, port));
306 break; 306 break;
307 case TURN: 307 case TURN:
308 case TURNS: { 308 case TURNS: {
309 cricket::RelayServerConfig config = cricket::RelayServerConfig( 309 turn_servers->push_back(cricket::RelayServerConfig(
310 address, port, username, server.password, turn_transport_type); 310 address, port, username, server.password, turn_transport_type));
311 if (server.tls_cert_policy ==
312 PeerConnectionInterface::kTlsCertPolicyInsecureNoCheck) {
313 config.tls_cert_policy =
314 cricket::TlsCertPolicy::TLS_CERT_POLICY_INSECURE_NO_CHECK;
315 }
316 turn_servers->push_back(config);
317 break; 311 break;
318 } 312 }
319 case INVALID: 313 case INVALID:
320 default: 314 default:
321 LOG(WARNING) << "Configuration not supported: " << url; 315 LOG(WARNING) << "Configuration not supported: " << url;
322 return false; 316 return false;
323 } 317 }
324 return true; 318 return true;
325 } 319 }
326 320
(...skipping 2079 matching lines...) Expand 10 before | Expand all | Expand 10 after
2406 2400
2407 bool PeerConnection::StartRtcEventLog_w(rtc::PlatformFile file, 2401 bool PeerConnection::StartRtcEventLog_w(rtc::PlatformFile file,
2408 int64_t max_size_bytes) { 2402 int64_t max_size_bytes) {
2409 return event_log_->StartLogging(file, max_size_bytes); 2403 return event_log_->StartLogging(file, max_size_bytes);
2410 } 2404 }
2411 2405
2412 void PeerConnection::StopRtcEventLog_w() { 2406 void PeerConnection::StopRtcEventLog_w() {
2413 event_log_->StopLogging(); 2407 event_log_->StopLogging();
2414 } 2408 }
2415 } // namespace webrtc 2409 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/api/peerconnection_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698