OLD | NEW |
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 722 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
733 } | 733 } |
734 if (remote_cert_report_id.get()) { | 734 if (remote_cert_report_id.get()) { |
735 channel_report->AddId(StatsReport::kStatsValueNameRemoteCertificateId, | 735 channel_report->AddId(StatsReport::kStatsValueNameRemoteCertificateId, |
736 remote_cert_report_id); | 736 remote_cert_report_id); |
737 } | 737 } |
738 const std::string& srtp_cipher = channel_iter.srtp_cipher; | 738 const std::string& srtp_cipher = channel_iter.srtp_cipher; |
739 if (!srtp_cipher.empty()) { | 739 if (!srtp_cipher.empty()) { |
740 channel_report->AddString(StatsReport::kStatsValueNameSrtpCipher, | 740 channel_report->AddString(StatsReport::kStatsValueNameSrtpCipher, |
741 srtp_cipher); | 741 srtp_cipher); |
742 } | 742 } |
743 const std::string& ssl_cipher = channel_iter.ssl_cipher; | 743 const std::string& ssl_cipher = channel_iter.ssl_cipher.rfc_name; |
744 if (!ssl_cipher.empty()) { | 744 if (!ssl_cipher.empty()) { |
745 channel_report->AddString(StatsReport::kStatsValueNameDtlsCipher, | 745 channel_report->AddString(StatsReport::kStatsValueNameDtlsCipher, |
746 ssl_cipher); | 746 ssl_cipher); |
747 } | 747 } |
748 | 748 |
749 int connection_id = 0; | 749 int connection_id = 0; |
750 for (const cricket::ConnectionInfo& info : | 750 for (const cricket::ConnectionInfo& info : |
751 channel_iter.connection_infos) { | 751 channel_iter.connection_infos) { |
752 StatsReport* connection_report = AddConnectionInfoReport( | 752 StatsReport* connection_report = AddConnectionInfoReport( |
753 transport_iter.first, channel_iter.component, connection_id++, | 753 transport_iter.first, channel_iter.component, connection_id++, |
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
940 report->set_timestamp(stats_gathering_started_); | 940 report->set_timestamp(stats_gathering_started_); |
941 } | 941 } |
942 | 942 |
943 } | 943 } |
944 | 944 |
945 void StatsCollector::ClearUpdateStatsCacheForTest() { | 945 void StatsCollector::ClearUpdateStatsCacheForTest() { |
946 stats_gathering_started_ = 0; | 946 stats_gathering_started_ = 0; |
947 } | 947 } |
948 | 948 |
949 } // namespace webrtc | 949 } // namespace webrtc |
OLD | NEW |