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

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

Issue 1380603005: Revert of Change WebRTC SslCipher to be exposed as number only. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 years, 2 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 | « 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 Candidate local_candidate; // The local candidate for this connection. 101 Candidate local_candidate; // The local candidate for this connection.
102 Candidate remote_candidate; // The remote candidate for this connection. 102 Candidate remote_candidate; // The remote candidate for this connection.
103 void* key; // A static value that identifies this conn. 103 void* key; // A static value that identifies this conn.
104 }; 104 };
105 105
106 // Information about all the connections of a channel. 106 // Information about all the connections of a channel.
107 typedef std::vector<ConnectionInfo> ConnectionInfos; 107 typedef std::vector<ConnectionInfo> ConnectionInfos;
108 108
109 // Information about a specific channel 109 // Information about a specific channel
110 struct TransportChannelStats { 110 struct TransportChannelStats {
111 int component = 0; 111 int component;
112 ConnectionInfos connection_infos; 112 ConnectionInfos connection_infos;
113 std::string srtp_cipher; 113 std::string srtp_cipher;
114 uint16_t ssl_cipher = 0; 114 std::string ssl_cipher;
115 }; 115 };
116 116
117 // Information about all the channels of a transport. 117 // Information about all the channels of a transport.
118 // TODO(hta): Consider if a simple vector is as good as a map. 118 // TODO(hta): Consider if a simple vector is as good as a map.
119 typedef std::vector<TransportChannelStats> TransportChannelStatsList; 119 typedef std::vector<TransportChannelStats> TransportChannelStatsList;
120 120
121 // Information about the stats of a transport. 121 // Information about the stats of a transport.
122 struct TransportStats { 122 struct TransportStats {
123 std::string transport_name; 123 std::string transport_name;
124 TransportChannelStatsList channel_stats; 124 TransportChannelStatsList channel_stats;
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 300
301 ChannelMap channels_; 301 ChannelMap channels_;
302 302
303 RTC_DISALLOW_COPY_AND_ASSIGN(Transport); 303 RTC_DISALLOW_COPY_AND_ASSIGN(Transport);
304 }; 304 };
305 305
306 306
307 } // namespace cricket 307 } // namespace cricket
308 308
309 #endif // WEBRTC_P2P_BASE_TRANSPORT_H_ 309 #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