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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
162 kIceConnectionNew, | 162 kIceConnectionNew, |
163 kIceConnectionChecking, | 163 kIceConnectionChecking, |
164 kIceConnectionConnected, | 164 kIceConnectionConnected, |
165 kIceConnectionCompleted, | 165 kIceConnectionCompleted, |
166 kIceConnectionFailed, | 166 kIceConnectionFailed, |
167 kIceConnectionDisconnected, | 167 kIceConnectionDisconnected, |
168 kIceConnectionClosed, | 168 kIceConnectionClosed, |
169 kIceConnectionMax, | 169 kIceConnectionMax, |
170 }; | 170 }; |
171 | 171 |
172 enum TlsCertificatePolicy { | |
173 kTlsCertPolicySecure, | |
174 kTlsCertPolicyInsecureNoCheck, | |
Taylor Brandstetter
2016/12/08 01:36:40
Add comments explaining what each of these values
hnsl1
2016/12/12 16:08:13
Done.
| |
175 }; | |
176 | |
172 struct IceServer { | 177 struct IceServer { |
173 // 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. |
174 std::string uri; | 179 std::string uri; |
175 std::vector<std::string> urls; | 180 std::vector<std::string> urls; |
176 std::string username; | 181 std::string username; |
177 std::string password; | 182 std::string password; |
183 TlsCertificatePolicy tls_certificate_policy; | |
pthatcher1
2016/12/07 21:29:35
Again, this shouldn't be an ICE server attribute.
Taylor Brandstetter
2016/12/08 01:36:40
I'd have this default to kTlsCertPolicySecure, as
hnsl1
2016/12/12 16:08:13
Done.
hnsl1
2016/12/12 16:08:13
Nack, see my other response about API design.
| |
178 }; | 184 }; |
179 typedef std::vector<IceServer> IceServers; | 185 typedef std::vector<IceServer> IceServers; |
180 | 186 |
181 enum IceTransportsType { | 187 enum IceTransportsType { |
182 // TODO(pthatcher): Rename these kTransporTypeXXX, but update | 188 // TODO(pthatcher): Rename these kTransporTypeXXX, but update |
183 // Chromium at the same time. | 189 // Chromium at the same time. |
184 kNone, | 190 kNone, |
185 kRelay, | 191 kRelay, |
186 kNoHost, | 192 kNoHost, |
187 kAll | 193 kAll |
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
769 cricket::WebRtcVideoEncoderFactory* encoder_factory, | 775 cricket::WebRtcVideoEncoderFactory* encoder_factory, |
770 cricket::WebRtcVideoDecoderFactory* decoder_factory) { | 776 cricket::WebRtcVideoDecoderFactory* decoder_factory) { |
771 return CreatePeerConnectionFactory( | 777 return CreatePeerConnectionFactory( |
772 worker_and_network_thread, worker_and_network_thread, signaling_thread, | 778 worker_and_network_thread, worker_and_network_thread, signaling_thread, |
773 default_adm, encoder_factory, decoder_factory); | 779 default_adm, encoder_factory, decoder_factory); |
774 } | 780 } |
775 | 781 |
776 } // namespace webrtc | 782 } // namespace webrtc |
777 | 783 |
778 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ | 784 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ |
OLD | NEW |