| OLD | NEW |
| 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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 std::string uri; | 186 std::string uri; |
| 187 std::vector<std::string> urls; | 187 std::vector<std::string> urls; |
| 188 std::string username; | 188 std::string username; |
| 189 std::string password; | 189 std::string password; |
| 190 TlsCertPolicy tls_cert_policy = kTlsCertPolicySecure; | 190 TlsCertPolicy tls_cert_policy = kTlsCertPolicySecure; |
| 191 // If the URIs in |urls| only contain IP addresses, this field can be used | 191 // If the URIs in |urls| only contain IP addresses, this field can be used |
| 192 // to indicate the hostname, which may be necessary for TLS (using the SNI | 192 // to indicate the hostname, which may be necessary for TLS (using the SNI |
| 193 // extension). If |urls| itself contains the hostname, this isn't | 193 // extension). If |urls| itself contains the hostname, this isn't |
| 194 // necessary. | 194 // necessary. |
| 195 std::string hostname; | 195 std::string hostname; |
| 196 // List of protocols to be used in the TLS ALPN extension. |
| 197 std::vector<std::string> tls_alpn_protocols; |
| 196 | 198 |
| 197 bool operator==(const IceServer& o) const { | 199 bool operator==(const IceServer& o) const { |
| 198 return uri == o.uri && urls == o.urls && username == o.username && | 200 return uri == o.uri && urls == o.urls && username == o.username && |
| 199 password == o.password && tls_cert_policy == o.tls_cert_policy && | 201 password == o.password && tls_cert_policy == o.tls_cert_policy && |
| 200 hostname == o.hostname; | 202 hostname == o.hostname && |
| 203 tls_alpn_protocols == o.tls_alpn_protocols; |
| 201 } | 204 } |
| 202 bool operator!=(const IceServer& o) const { return !(*this == o); } | 205 bool operator!=(const IceServer& o) const { return !(*this == o); } |
| 203 }; | 206 }; |
| 204 typedef std::vector<IceServer> IceServers; | 207 typedef std::vector<IceServer> IceServers; |
| 205 | 208 |
| 206 enum IceTransportsType { | 209 enum IceTransportsType { |
| 207 // TODO(pthatcher): Rename these kTransporTypeXXX, but update | 210 // TODO(pthatcher): Rename these kTransporTypeXXX, but update |
| 208 // Chromium at the same time. | 211 // Chromium at the same time. |
| 209 kNone, | 212 kNone, |
| 210 kRelay, | 213 kRelay, |
| (...skipping 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1212 cricket::WebRtcVideoEncoderFactory* video_encoder_factory, | 1215 cricket::WebRtcVideoEncoderFactory* video_encoder_factory, |
| 1213 cricket::WebRtcVideoDecoderFactory* video_decoder_factory, | 1216 cricket::WebRtcVideoDecoderFactory* video_decoder_factory, |
| 1214 rtc::scoped_refptr<AudioMixer> audio_mixer, | 1217 rtc::scoped_refptr<AudioMixer> audio_mixer, |
| 1215 std::unique_ptr<cricket::MediaEngineInterface> media_engine, | 1218 std::unique_ptr<cricket::MediaEngineInterface> media_engine, |
| 1216 std::unique_ptr<CallFactoryInterface> call_factory, | 1219 std::unique_ptr<CallFactoryInterface> call_factory, |
| 1217 std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory); | 1220 std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory); |
| 1218 | 1221 |
| 1219 } // namespace webrtc | 1222 } // namespace webrtc |
| 1220 | 1223 |
| 1221 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ | 1224 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ |
| OLD | NEW |