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

Side by Side Diff: webrtc/pc/iceserverparsing.cc

Issue 2993403002: Support a user-provided string for the TLS ALPN extension.
Patch Set: Fix previous commit Created 3 years, 3 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/client/basicportallocator.cc ('k') | webrtc/rtc_base/BUILD.gn » ('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 2017 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2017 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 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 } 250 }
251 socket_address.SetResolvedIP(ip); 251 socket_address.SetResolvedIP(ip);
252 } 252 }
253 cricket::RelayServerConfig config = cricket::RelayServerConfig( 253 cricket::RelayServerConfig config = cricket::RelayServerConfig(
254 socket_address, username, server.password, turn_transport_type); 254 socket_address, username, server.password, turn_transport_type);
255 if (server.tls_cert_policy == 255 if (server.tls_cert_policy ==
256 PeerConnectionInterface::kTlsCertPolicyInsecureNoCheck) { 256 PeerConnectionInterface::kTlsCertPolicyInsecureNoCheck) {
257 config.tls_cert_policy = 257 config.tls_cert_policy =
258 cricket::TlsCertPolicy::TLS_CERT_POLICY_INSECURE_NO_CHECK; 258 cricket::TlsCertPolicy::TLS_CERT_POLICY_INSECURE_NO_CHECK;
259 } 259 }
260 config.tls_alpn_protocols = server.tls_alpn_protocols;
261
260 turn_servers->push_back(config); 262 turn_servers->push_back(config);
261 break; 263 break;
262 } 264 }
263 default: 265 default:
264 // We shouldn't get to this point with an invalid service_type, we should 266 // We shouldn't get to this point with an invalid service_type, we should
265 // have returned an error already. 267 // have returned an error already.
266 RTC_NOTREACHED() << "Unexpected service type"; 268 RTC_NOTREACHED() << "Unexpected service type";
267 return RTCErrorType::INTERNAL_ERROR; 269 return RTCErrorType::INTERNAL_ERROR;
268 } 270 }
269 return RTCErrorType::NONE; 271 return RTCErrorType::NONE;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 // are performed in a well-defined order. 304 // are performed in a well-defined order.
303 int priority = static_cast<int>(turn_servers->size() - 1); 305 int priority = static_cast<int>(turn_servers->size() - 1);
304 for (cricket::RelayServerConfig& turn_server : *turn_servers) { 306 for (cricket::RelayServerConfig& turn_server : *turn_servers) {
305 // First in the list gets highest priority. 307 // First in the list gets highest priority.
306 turn_server.priority = priority--; 308 turn_server.priority = priority--;
307 } 309 }
308 return RTCErrorType::NONE; 310 return RTCErrorType::NONE;
309 } 311 }
310 312
311 } // namespace webrtc 313 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/p2p/client/basicportallocator.cc ('k') | webrtc/rtc_base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698