Index: talk/app/webrtc/umametrics.h |
diff --git a/talk/app/webrtc/umametrics.h b/talk/app/webrtc/umametrics.h |
index 8eaed6d2ff58ec291c6d4e2b4b24909b890bda46..ee0e932a723700a91fbb83ff30c993a80a85597d 100644 |
--- a/talk/app/webrtc/umametrics.h |
+++ b/talk/app/webrtc/umametrics.h |
@@ -42,6 +42,13 @@ enum PeerConnectionEnumCounterType { |
// to the TURN server in the case of TURN candidates. |
kEnumCounterIceCandidatePairTypeUdp, |
kEnumCounterIceCandidatePairTypeTcp, |
+ |
+ kEnumCounterAudioSrtpCipher, |
+ kEnumCounterAudioSslCipher, |
+ kEnumCounterVideoSrtpCipher, |
+ kEnumCounterVideoSslCipher, |
+ kEnumCounterDataSrtpCipher, |
+ kEnumCounterDataSslCipher, |
kPeerConnectionEnumCounterMax |
}; |
@@ -78,12 +85,6 @@ enum PeerConnectionMetricsName { |
kTimeToConnect, // In milliseconds. |
kLocalCandidates_IPv4, // Number of IPv4 local candidates. |
kLocalCandidates_IPv6, // Number of IPv6 local candidates. |
- kAudioSrtpCipher, // Name of SRTP cipher used in audio channel. |
- kAudioSslCipher, // Name of SSL cipher used in audio channel. |
- kVideoSrtpCipher, // Name of SRTP cipher used in video channel. |
- kVideoSslCipher, // Name of SSL cipher used in video channel. |
- kDataSrtpCipher, // Name of SRTP cipher used in data channel. |
- kDataSslCipher, // Name of SSL cipher used in data channel. |
kPeerConnectionMetricsName_Max |
}; |
@@ -122,6 +123,17 @@ enum IceCandidatePairType { |
kIceCandidatePairMax |
}; |
+// The same list as SrtpCipherMap from opensslstsreamadapter.cc. Must be kept |
juberti
2015/09/24 21:37:32
We should use the IDs from https://tools.ietf.org/
guoweis_webrtc
2015/09/25 18:30:31
Done.
|
+// the same as the order in histograms.xml. |
+enum SrtpCipherType { |
+ SrtpCipher_Unknown, |
+ SrtpCipher_AES_CM_128_HMAC_SHA1_32, |
+ SrtpCipher_AES_CM_128_HMAC_SHA1_80, |
+ SrtpCipher_Max, |
juberti
2015/09/24 21:37:32
Why do we have these _Max values?
guoweis_webrtc
2015/09/25 18:30:32
Done.
|
+}; |
+ |
+SrtpCipherType GetSrtpCipherType(const std::string& cipher); |
+ |
} // namespace webrtc |
#endif // TALK_APP_WEBRTC_UMAMETRICS_H_ |