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

Side by Side Diff: talk/app/webrtc/statscollector.cc

Issue 1377733004: Convert uint16_t to int for WebRTC cipher/crypto suite (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 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after
727 } 727 }
728 if (remote_cert_report_id.get()) { 728 if (remote_cert_report_id.get()) {
729 channel_report->AddId(StatsReport::kStatsValueNameRemoteCertificateId, 729 channel_report->AddId(StatsReport::kStatsValueNameRemoteCertificateId,
730 remote_cert_report_id); 730 remote_cert_report_id);
731 } 731 }
732 const std::string& srtp_cipher = channel_iter.srtp_cipher; 732 const std::string& srtp_cipher = channel_iter.srtp_cipher;
733 if (!srtp_cipher.empty()) { 733 if (!srtp_cipher.empty()) {
734 channel_report->AddString(StatsReport::kStatsValueNameSrtpCipher, 734 channel_report->AddString(StatsReport::kStatsValueNameSrtpCipher,
735 srtp_cipher); 735 srtp_cipher);
736 } 736 }
737 uint16_t ssl_cipher = channel_iter.ssl_cipher; 737 int ssl_cipher = channel_iter.ssl_cipher;
738 if (ssl_cipher && 738 if (ssl_cipher &&
739 rtc::SSLStreamAdapter::GetSslCipherSuiteName(ssl_cipher).length()) { 739 rtc::SSLStreamAdapter::GetSslCipherSuiteName(ssl_cipher).length()) {
740 channel_report->AddString( 740 channel_report->AddString(
741 StatsReport::kStatsValueNameDtlsCipher, 741 StatsReport::kStatsValueNameDtlsCipher,
742 rtc::SSLStreamAdapter::GetSslCipherSuiteName(ssl_cipher)); 742 rtc::SSLStreamAdapter::GetSslCipherSuiteName(ssl_cipher));
743 } 743 }
744 744
745 int connection_id = 0; 745 int connection_id = 0;
746 for (const cricket::ConnectionInfo& info : 746 for (const cricket::ConnectionInfo& info :
747 channel_iter.connection_infos) { 747 channel_iter.connection_infos) {
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
935 StatsReport* report = entry.second; 935 StatsReport* report = entry.second;
936 report->set_timestamp(stats_gathering_started_); 936 report->set_timestamp(stats_gathering_started_);
937 } 937 }
938 } 938 }
939 939
940 void StatsCollector::ClearUpdateStatsCacheForTest() { 940 void StatsCollector::ClearUpdateStatsCacheForTest() {
941 stats_gathering_started_ = 0; 941 stats_gathering_started_ = 0;
942 } 942 }
943 943
944 } // namespace webrtc 944 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | talk/app/webrtc/statscollector_unittest.cc » ('j') | webrtc/p2p/base/transportchannel.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698