Change WebRTC SslCipher to be exposed as number only.

talk/app/webrtc/umametrics.h

 /*
  * libjingle
  * Copyright 2014 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 24 matching lines @@
 // Used to specify which enum counter type we're incrementing in
 // MetricsObserverInterface::IncrementEnumCounter.
 enum PeerConnectionEnumCounterType {
   kEnumCounterAddressFamily,
   // For the next 2 counters, we track them separately based on the "first hop"
   // protocol used by the local candidate. "First hop" means the local candidate
   // type in the case of non-TURN candidates, and the protocol used to connect
   // to the TURN server in the case of TURN candidates.
   kEnumCounterIceCandidatePairTypeUdp,
   kEnumCounterIceCandidatePairTypeTcp,
+
+  kEnumCounterAudioSrtpCipher,
+  kEnumCounterAudioSslCipher,
+  kEnumCounterVideoSrtpCipher,
+  kEnumCounterVideoSslCipher,
+  kEnumCounterDataSrtpCipher,
+  kEnumCounterDataSslCipher,
   kPeerConnectionEnumCounterMax
 };
 
 // Currently this contains information related to WebRTC network/transport
 // information.
 
 // The difference between PeerConnectionEnumCounter and
 // PeerConnectionMetricsName is that the "EnumCounter" is only counting the
 // occurrences of events, while "Name" has a value associated with it which is
 // used to form a histogram.
@@ skipping 16 matching lines @@
 // TODO(guoweis): Keep previous name here until all references are renamed.
 typedef PeerConnectionAddressFamilyCounter PeerConnectionUMAMetricsCounter;
 
 // This enum defines types for UMA samples, which will have a range.
 enum PeerConnectionMetricsName {
   kNetworkInterfaces_IPv4,  // Number of IPv4 interfaces.
   kNetworkInterfaces_IPv6,  // Number of IPv6 interfaces.
   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
 };
 
 // TODO(guoweis): Keep previous name here until all references are renamed.
 typedef PeerConnectionMetricsName PeerConnectionUMAMetricsName;
 
 // The IceCandidatePairType has the format of
 // <local_candidate_type>_<remote_candidate_type>. It is recorded based on the
 // type of candidate pair used when the PeerConnection first goes to a completed
 // state. When BUNDLE is enabled, only the first transport gets recorded.
@@ skipping 18 matching lines @@
 
   // The following 4 types tell whether local and remote hosts have private or
   // public IP addresses.
   kIceCandidatePairHostPrivateHostPrivate,
   kIceCandidatePairHostPrivateHostPublic,
   kIceCandidatePairHostPublicHostPrivate,
   kIceCandidatePairHostPublicHostPublic,
   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/html/rfc5764#section-4.1.2
instead. But this should go down into srtpfilter.h or similar.

[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_