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

Side by Side Diff: webrtc/p2p/base/transportdescription.h

Issue 2537343003: Removing "crypto_required" from MediaContentDescription. (Closed)
Patch Set: Merge with master and clean up CreateDataChannel Created 4 years 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/api/webrtcsession_unittest.cc ('k') | webrtc/pc/channel.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 10 matching lines...) Expand all
21 21
22 namespace cricket { 22 namespace cricket {
23 23
24 // SEC_ENABLED and SEC_REQUIRED should only be used if the session 24 // SEC_ENABLED and SEC_REQUIRED should only be used if the session
25 // was negotiated over TLS, to protect the inline crypto material 25 // was negotiated over TLS, to protect the inline crypto material
26 // exchange. 26 // exchange.
27 // SEC_DISABLED: No crypto in outgoing offer, ignore any supplied crypto. 27 // SEC_DISABLED: No crypto in outgoing offer, ignore any supplied crypto.
28 // SEC_ENABLED: Crypto in outgoing offer and answer (if supplied in offer). 28 // SEC_ENABLED: Crypto in outgoing offer and answer (if supplied in offer).
29 // SEC_REQUIRED: Crypto in outgoing offer and answer. Fail any offer with absent 29 // SEC_REQUIRED: Crypto in outgoing offer and answer. Fail any offer with absent
30 // or unsupported crypto. 30 // or unsupported crypto.
31 // TODO(deadbeef): Remove this or rename it to something more appropriate, like
32 // SdesPolicy.
31 enum SecurePolicy { 33 enum SecurePolicy {
32 SEC_DISABLED, 34 SEC_DISABLED,
33 SEC_ENABLED, 35 SEC_ENABLED,
34 SEC_REQUIRED 36 SEC_REQUIRED
35 }; 37 };
36 38
37 // Whether our side of the call is driving the negotiation, or the other side. 39 // Whether our side of the call is driving the negotiation, or the other side.
38 enum IceRole { 40 enum IceRole {
39 ICEROLE_CONTROLLING = 0, 41 ICEROLE_CONTROLLING = 0,
40 ICEROLE_CONTROLLED, 42 ICEROLE_CONTROLLED,
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 std::string ice_pwd; 166 std::string ice_pwd;
165 IceMode ice_mode; 167 IceMode ice_mode;
166 ConnectionRole connection_role; 168 ConnectionRole connection_role;
167 169
168 std::unique_ptr<rtc::SSLFingerprint> identity_fingerprint; 170 std::unique_ptr<rtc::SSLFingerprint> identity_fingerprint;
169 }; 171 };
170 172
171 } // namespace cricket 173 } // namespace cricket
172 174
173 #endif // WEBRTC_P2P_BASE_TRANSPORTDESCRIPTION_H_ 175 #endif // WEBRTC_P2P_BASE_TRANSPORTDESCRIPTION_H_
OLDNEW
« no previous file with comments | « webrtc/api/webrtcsession_unittest.cc ('k') | webrtc/pc/channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698