Index: talk/app/webrtc/webrtcsession.cc |
diff --git a/talk/app/webrtc/webrtcsession.cc b/talk/app/webrtc/webrtcsession.cc |
index 0c0e44d0e07b5dd6a6325cc4aa4be812a765cd68..dbe0210501e96dd66c795f03e0b854c034254c33 100644 |
--- a/talk/app/webrtc/webrtcsession.cc |
+++ b/talk/app/webrtc/webrtcsession.cc |
@@ -88,6 +88,14 @@ const char kDtlsSetupFailureRtcp[] = |
"Couldn't set up DTLS-SRTP on RTCP channel."; |
const int kMaxUnsignalledRecvStreams = 20; |
+SrtpCipherType GetSrtpCipherType(const std::string& cipher) { |
+ if (cipher == "AES_CM_128_HMAC_SHA1_32") |
juberti
2015/09/24 13:41:15
is there some pre-existing constant somewhere we c
guoweis_webrtc
2015/09/24 18:27:13
Done.
|
+ return SrtpCipherType_AES_CM_128_HMAC_SHA1_32; |
+ if (cipher == "AES_CM_128_HMAC_SHA1_80") |
+ return SrtpCipherType_AES_CM_128_HMAC_SHA1_80; |
+ return SrtpCipherType_Unknown; |
juberti
2015/09/24 13:41:15
Usually we don't replicate 'Type' in enum values.
guoweis_webrtc
2015/09/24 18:27:13
Done.
|
+} |
+ |
IceCandidatePairType GetIceCandidatePairCounter( |
const cricket::Candidate& local, |
const cricket::Candidate& remote) { |
@@ -2054,6 +2062,9 @@ void WebRtcSession::ReportBestConnectionState( |
} |
} |
+// Since this is reported in the first OnTransportCompleted, in the non-bundled |
+// case, we might not be reporting anything other than the first completed |
+// channel. |
void WebRtcSession::ReportNegotiatedCiphers( |
const cricket::TransportStats& stats) { |
RTC_DCHECK(metrics_observer_ != NULL); |
@@ -2062,32 +2073,35 @@ void WebRtcSession::ReportNegotiatedCiphers( |
} |
const std::string& srtp_cipher = stats.channel_stats[0].srtp_cipher; |
- const std::string& ssl_cipher = stats.channel_stats[0].ssl_cipher; |
- if (srtp_cipher.empty() && ssl_cipher.empty()) { |
+ const rtc::SslCipher ssl_cipher = stats.channel_stats[0].ssl_cipher; |
+ if (srtp_cipher.empty() && ssl_cipher.rfc_name.empty()) { |
return; |
} |
- PeerConnectionMetricsName srtp_name; |
- PeerConnectionMetricsName ssl_name; |
+ PeerConnectionEnumCounterType srtp_counter_type; |
+ PeerConnectionEnumCounterType ssl_counter_type; |
if (stats.content_name == cricket::CN_AUDIO) { |
- srtp_name = kAudioSrtpCipher; |
- ssl_name = kAudioSslCipher; |
+ srtp_counter_type = kEnumCounterAudioSrtpCipher; |
+ ssl_counter_type = kEnumCounterAudioSslCipher; |
} else if (stats.content_name == cricket::CN_VIDEO) { |
- srtp_name = kVideoSrtpCipher; |
- ssl_name = kVideoSslCipher; |
+ srtp_counter_type = kEnumCounterVideoSrtpCipher; |
+ ssl_counter_type = kEnumCounterVideoSslCipher; |
} else if (stats.content_name == cricket::CN_DATA) { |
- srtp_name = kDataSrtpCipher; |
- ssl_name = kDataSslCipher; |
+ srtp_counter_type = kEnumCounterDataSrtpCipher; |
+ ssl_counter_type = kEnumCounterDataSslCipher; |
} else { |
RTC_NOTREACHED(); |
return; |
} |
if (!srtp_cipher.empty()) { |
- metrics_observer_->AddHistogramSample(srtp_name, srtp_cipher); |
+ metrics_observer_->IncrementEnumCounter( |
+ srtp_counter_type, GetSrtpCipherType(srtp_cipher), SrtpCipherType_Max); |
} |
- if (!ssl_cipher.empty()) { |
- metrics_observer_->AddHistogramSample(ssl_name, ssl_cipher); |
+ if (!ssl_cipher.rfc_name.empty()) { |
+ RTC_DCHECK(ssl_cipher.ssl_id); |
+ metrics_observer_->IncrementSparseEnumCounter(ssl_counter_type, |
+ ssl_cipher.ssl_id); |
} |
} |