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

Side by Side Diff: webrtc/api/peerconnectioninterface.h

Issue 2926823003: Allow passing both hostname and IP of ICE server into PeerConnection. (Closed)
Patch Set: Created 3 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 | « no previous file | webrtc/p2p/base/portallocator.h » ('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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 kTlsCertPolicyInsecureNoCheck, 174 kTlsCertPolicyInsecureNoCheck,
175 }; 175 };
176 176
177 struct IceServer { 177 struct IceServer {
178 // TODO(jbauch): Remove uri when all code using it has switched to urls. 178 // TODO(jbauch): Remove uri when all code using it has switched to urls.
179 std::string uri; 179 std::string uri;
180 std::vector<std::string> urls; 180 std::vector<std::string> urls;
181 std::string username; 181 std::string username;
182 std::string password; 182 std::string password;
183 TlsCertPolicy tls_cert_policy = kTlsCertPolicySecure; 183 TlsCertPolicy tls_cert_policy = kTlsCertPolicySecure;
184 // Optional; can be used if the IP address of this server was resolved
185 // ahead of time, so that webrtc doesn't need to do a redundant lookup.
186 rtc::IPAddress ip;
184 187
185 bool operator==(const IceServer& o) const { 188 bool operator==(const IceServer& o) const {
186 return uri == o.uri && urls == o.urls && username == o.username && 189 return uri == o.uri && urls == o.urls && username == o.username &&
187 password == o.password && tls_cert_policy == o.tls_cert_policy; 190 password == o.password && tls_cert_policy == o.tls_cert_policy;
188 } 191 }
189 bool operator!=(const IceServer& o) const { return !(*this == o); } 192 bool operator!=(const IceServer& o) const { return !(*this == o); }
190 }; 193 };
191 typedef std::vector<IceServer> IceServers; 194 typedef std::vector<IceServer> IceServers;
192 195
193 enum IceTransportsType { 196 enum IceTransportsType {
(...skipping 928 matching lines...) Expand 10 before | Expand all | Expand 10 after
1122 cricket::WebRtcVideoEncoderFactory* encoder_factory, 1125 cricket::WebRtcVideoEncoderFactory* encoder_factory,
1123 cricket::WebRtcVideoDecoderFactory* decoder_factory) { 1126 cricket::WebRtcVideoDecoderFactory* decoder_factory) {
1124 return CreatePeerConnectionFactory( 1127 return CreatePeerConnectionFactory(
1125 worker_and_network_thread, worker_and_network_thread, signaling_thread, 1128 worker_and_network_thread, worker_and_network_thread, signaling_thread,
1126 default_adm, encoder_factory, decoder_factory); 1129 default_adm, encoder_factory, decoder_factory);
1127 } 1130 }
1128 1131
1129 } // namespace webrtc 1132 } // namespace webrtc
1130 1133
1131 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ 1134 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/p2p/base/portallocator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698