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

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
« 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 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 } 300 }
301 301
302 302
303 bool Transport::GetStats(TransportStats* stats) { 303 bool Transport::GetStats(TransportStats* stats) {
304 stats->transport_name = name(); 304 stats->transport_name = name();
305 stats->channel_stats.clear(); 305 stats->channel_stats.clear();
306 for (auto kv : channels_) { 306 for (auto kv : channels_) {
307 TransportChannelImpl* channel = kv.second; 307 TransportChannelImpl* channel = kv.second;
308 TransportChannelStats substats; 308 TransportChannelStats substats;
309 substats.component = channel->component(); 309 substats.component = channel->component();
310 channel->GetSrtpCipher(&substats.srtp_cipher); 310 channel->GetSrtpCryptoSuite(&substats.srtp_cipher);
311 channel->GetSslCipher(&substats.ssl_cipher); 311 channel->GetSslCipherSuite(&substats.ssl_cipher);
312 if (!channel->GetStats(&substats.connection_infos)) { 312 if (!channel->GetStats(&substats.connection_infos)) {
313 return false; 313 return false;
314 } 314 }
315 stats->channel_stats.push_back(substats); 315 stats->channel_stats.push_back(substats);
316 } 316 }
317 return true; 317 return true;
318 } 318 }
319 319
320 bool Transport::AddRemoteCandidates(const std::vector<Candidate>& candidates, 320 bool Transport::AddRemoteCandidates(const std::vector<Candidate>& candidates,
321 std::string* error) { 321 std::string* error) {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 // negotiation happens. 384 // negotiation happens.
385 for (const auto& kv : channels_) { 385 for (const auto& kv : channels_) {
386 if (!ApplyNegotiatedTransportDescription(kv.second, error_desc)) { 386 if (!ApplyNegotiatedTransportDescription(kv.second, error_desc)) {
387 return false; 387 return false;
388 } 388 }
389 } 389 }
390 return true; 390 return true;
391 } 391 }
392 392
393 } // namespace cricket 393 } // 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