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

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

Issue 1458023002: Reland Convert internal representation of Srtp cryptos from string to int (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 years, 1 month 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/p2p/base/p2ptransportchannel.h ('k') | webrtc/p2p/base/transport.cc » ('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 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 void* key; // A static value that identifies this conn. 116 void* key; // A static value that identifies this conn.
117 }; 117 };
118 118
119 // Information about all the connections of a channel. 119 // Information about all the connections of a channel.
120 typedef std::vector<ConnectionInfo> ConnectionInfos; 120 typedef std::vector<ConnectionInfo> ConnectionInfos;
121 121
122 // Information about a specific channel 122 // Information about a specific channel
123 struct TransportChannelStats { 123 struct TransportChannelStats {
124 int component = 0; 124 int component = 0;
125 ConnectionInfos connection_infos; 125 ConnectionInfos connection_infos;
126 std::string srtp_cipher; 126 int srtp_crypto_suite = rtc::SRTP_INVALID_CRYPTO_SUITE;
127 int ssl_cipher = 0; 127 int ssl_cipher_suite = rtc::TLS_NULL_WITH_NULL_NULL;
128 }; 128 };
129 129
130 // Information about all the channels of a transport. 130 // Information about all the channels of a transport.
131 // TODO(hta): Consider if a simple vector is as good as a map. 131 // TODO(hta): Consider if a simple vector is as good as a map.
132 typedef std::vector<TransportChannelStats> TransportChannelStatsList; 132 typedef std::vector<TransportChannelStats> TransportChannelStatsList;
133 133
134 // Information about the stats of a transport. 134 // Information about the stats of a transport.
135 struct TransportStats { 135 struct TransportStats {
136 std::string transport_name; 136 std::string transport_name;
137 TransportChannelStatsList channel_stats; 137 TransportChannelStatsList channel_stats;
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 313
314 ChannelMap channels_; 314 ChannelMap channels_;
315 315
316 RTC_DISALLOW_COPY_AND_ASSIGN(Transport); 316 RTC_DISALLOW_COPY_AND_ASSIGN(Transport);
317 }; 317 };
318 318
319 319
320 } // namespace cricket 320 } // namespace cricket
321 321
322 #endif // WEBRTC_P2P_BASE_TRANSPORT_H_ 322 #endif // WEBRTC_P2P_BASE_TRANSPORT_H_
OLDNEW
« no previous file with comments | « webrtc/p2p/base/p2ptransportchannel.h ('k') | webrtc/p2p/base/transport.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698