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

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

Issue 2815513012: Negotiate the same SRTP crypto suites for every DTLS association formed. (Closed)
Patch Set: Merge with master Created 3 years, 8 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/base/sslstreamadapter.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 864 matching lines...) Expand 10 before | Expand all | Expand 10 after
875 875
876 // Sets the maximum supported protocol version. The highest version 876 // Sets the maximum supported protocol version. The highest version
877 // supported by both ends will be used for the connection, i.e. if one 877 // supported by both ends will be used for the connection, i.e. if one
878 // party supports DTLS 1.0 and the other DTLS 1.2, DTLS 1.0 will be used. 878 // party supports DTLS 1.0 and the other DTLS 1.2, DTLS 1.0 will be used.
879 rtc::SSLProtocolVersion ssl_max_version = rtc::SSL_PROTOCOL_DTLS_12; 879 rtc::SSLProtocolVersion ssl_max_version = rtc::SSL_PROTOCOL_DTLS_12;
880 880
881 // Sets crypto related options, e.g. enabled cipher suites. 881 // Sets crypto related options, e.g. enabled cipher suites.
882 rtc::CryptoOptions crypto_options; 882 rtc::CryptoOptions crypto_options;
883 }; 883 };
884 884
885 // Set the options to be used for subsequently created PeerConnections.
885 virtual void SetOptions(const Options& options) = 0; 886 virtual void SetOptions(const Options& options) = 0;
886 887
887 // |allocator| and |cert_generator| may be null, in which case default 888 // |allocator| and |cert_generator| may be null, in which case default
888 // implementations will be used. 889 // implementations will be used.
889 // 890 //
890 // |observer| must not be null. 891 // |observer| must not be null.
891 // 892 //
892 // Note that this method does not take ownership of |observer|; it's the 893 // Note that this method does not take ownership of |observer|; it's the
893 // responsibility of the caller to delete it. It can be safely deleted after 894 // responsibility of the caller to delete it. It can be safely deleted after
894 // Close has been called on the returned PeerConnection, which ensures no 895 // Close has been called on the returned PeerConnection, which ensures no
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
1106 cricket::WebRtcVideoEncoderFactory* encoder_factory, 1107 cricket::WebRtcVideoEncoderFactory* encoder_factory,
1107 cricket::WebRtcVideoDecoderFactory* decoder_factory) { 1108 cricket::WebRtcVideoDecoderFactory* decoder_factory) {
1108 return CreatePeerConnectionFactory( 1109 return CreatePeerConnectionFactory(
1109 worker_and_network_thread, worker_and_network_thread, signaling_thread, 1110 worker_and_network_thread, worker_and_network_thread, signaling_thread,
1110 default_adm, encoder_factory, decoder_factory); 1111 default_adm, encoder_factory, decoder_factory);
1111 } 1112 }
1112 1113
1113 } // namespace webrtc 1114 } // namespace webrtc
1114 1115
1115 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ 1116 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/base/sslstreamadapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698