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

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

Issue 1337673002: 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
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 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 } 386 }
387 387
388 388
389 bool Transport::GetStats(TransportStats* stats) { 389 bool Transport::GetStats(TransportStats* stats) {
390 stats->transport_name = name(); 390 stats->transport_name = name();
391 stats->channel_stats.clear(); 391 stats->channel_stats.clear();
392 for (auto iter : channels_) { 392 for (auto iter : channels_) {
393 ChannelMapEntry& entry = iter.second; 393 ChannelMapEntry& entry = iter.second;
394 TransportChannelStats substats; 394 TransportChannelStats substats;
395 substats.component = entry->component(); 395 substats.component = entry->component();
396 entry->GetSrtpCipher(&substats.srtp_cipher); 396 entry->GetSrtpCipherByRfcName(&substats.srtp_cipher);
397 entry->GetSslCipher(&substats.ssl_cipher); 397 entry->GetSslCipher(&substats.ssl_cipher);
398 if (!entry->GetStats(&substats.connection_infos)) { 398 if (!entry->GetStats(&substats.connection_infos)) {
399 return false; 399 return false;
400 } 400 }
401 stats->channel_stats.push_back(substats); 401 stats->channel_stats.push_back(substats);
402 } 402 }
403 return true; 403 return true;
404 } 404 }
405 405
406 bool Transport::AddRemoteCandidates(const std::vector<Candidate>& candidates, 406 bool Transport::AddRemoteCandidates(const std::vector<Candidate>& candidates,
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 // creation, we have the negotiation state saved until a new 624 // creation, we have the negotiation state saved until a new
625 // negotiation happens. 625 // negotiation happens.
626 for (auto& iter : channels_) { 626 for (auto& iter : channels_) {
627 if (!ApplyNegotiatedTransportDescription(iter.second.get(), error_desc)) 627 if (!ApplyNegotiatedTransportDescription(iter.second.get(), error_desc))
628 return false; 628 return false;
629 } 629 }
630 return true; 630 return true;
631 } 631 }
632 632
633 } // namespace cricket 633 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698