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

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

Issue 1416673006: Convert internal representation of Srtp cryptos from string to int. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: change srtp crypto name conversion 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/transport.h ('k') | webrtc/p2p/base/transportchannel.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 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 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 } 298 }
299 299
300 300
301 bool Transport::GetStats(TransportStats* stats) { 301 bool Transport::GetStats(TransportStats* stats) {
302 stats->transport_name = name(); 302 stats->transport_name = name();
303 stats->channel_stats.clear(); 303 stats->channel_stats.clear();
304 for (auto kv : channels_) { 304 for (auto kv : channels_) {
305 TransportChannelImpl* channel = kv.second; 305 TransportChannelImpl* channel = kv.second;
306 TransportChannelStats substats; 306 TransportChannelStats substats;
307 substats.component = channel->component(); 307 substats.component = channel->component();
308 channel->GetSrtpCryptoSuite(&substats.srtp_cipher); 308 channel->GetSrtpCryptoSuite(&substats.srtp_crypto_suite);
309 channel->GetSslCipherSuite(&substats.ssl_cipher); 309 channel->GetSslCipherSuite(&substats.ssl_cipher_suite);
310 if (!channel->GetStats(&substats.connection_infos)) { 310 if (!channel->GetStats(&substats.connection_infos)) {
311 return false; 311 return false;
312 } 312 }
313 stats->channel_stats.push_back(substats); 313 stats->channel_stats.push_back(substats);
314 } 314 }
315 return true; 315 return true;
316 } 316 }
317 317
318 bool Transport::AddRemoteCandidates(const std::vector<Candidate>& candidates, 318 bool Transport::AddRemoteCandidates(const std::vector<Candidate>& candidates,
319 std::string* error) { 319 std::string* error) {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 // negotiation happens. 382 // negotiation happens.
383 for (const auto& kv : channels_) { 383 for (const auto& kv : channels_) {
384 if (!ApplyNegotiatedTransportDescription(kv.second, error_desc)) { 384 if (!ApplyNegotiatedTransportDescription(kv.second, error_desc)) {
385 return false; 385 return false;
386 } 386 }
387 } 387 }
388 return true; 388 return true;
389 } 389 }
390 390
391 } // namespace cricket 391 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/p2p/base/transport.h ('k') | webrtc/p2p/base/transportchannel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698