From 01560dead90f9894692bbf70906f426b8ec2c7bc Mon Sep 17 00:00:00 2001 From: Qingsi Wang Date: Thu, 26 Jul 2018 10:44:02 -0700 Subject: [PATCH] Use "wildcard" instead of "unknown" for ADAPTER_TYPE_ANY in stats. TBR=hta@webrtc.org Bug: None Change-Id: I3ccff01f2ad51aebc1241fab2b41518b769adc8a Reviewed-on: https://webrtc-review.googlesource.com/90800 Commit-Queue: Qingsi Wang Reviewed-by: Steve Anton Cr-Commit-Position: refs/heads/master@{#24120} --- pc/statscollector.cc | 4 +++- rtc_base/network.cc | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pc/statscollector.cc b/pc/statscollector.cc index 14a6c77b4a..e42244a0c0 100644 --- a/pc/statscollector.cc +++ b/pc/statscollector.cc @@ -39,6 +39,7 @@ const char* STATSREPORT_ADAPTER_TYPE_WIFI = "wlan"; const char* STATSREPORT_ADAPTER_TYPE_WWAN = "wwan"; const char* STATSREPORT_ADAPTER_TYPE_VPN = "vpn"; const char* STATSREPORT_ADAPTER_TYPE_LOOPBACK = "loopback"; +const char* STATSREPORT_ADAPTER_TYPE_WILDCARD = "wildcard"; template struct TypeForAdd { @@ -414,7 +415,6 @@ const char* IceCandidateTypeToStatsType(const std::string& candidate_type) { const char* AdapterTypeToStatsType(rtc::AdapterType type) { switch (type) { - case rtc::ADAPTER_TYPE_ANY: case rtc::ADAPTER_TYPE_UNKNOWN: return "unknown"; case rtc::ADAPTER_TYPE_ETHERNET: @@ -427,6 +427,8 @@ const char* AdapterTypeToStatsType(rtc::AdapterType type) { return STATSREPORT_ADAPTER_TYPE_VPN; case rtc::ADAPTER_TYPE_LOOPBACK: return STATSREPORT_ADAPTER_TYPE_LOOPBACK; + case rtc::ADAPTER_TYPE_ANY: + return STATSREPORT_ADAPTER_TYPE_WILDCARD; default: RTC_NOTREACHED(); return ""; diff --git a/rtc_base/network.cc b/rtc_base/network.cc index 0f42d6fe30..34da828477 100644 --- a/rtc_base/network.cc +++ b/rtc_base/network.cc @@ -95,6 +95,7 @@ bool SortNetworks(const Network* a, const Network* b) { std::string AdapterTypeToString(AdapterType type) { switch (type) { case ADAPTER_TYPE_ANY: + return "Wildcard"; case ADAPTER_TYPE_UNKNOWN: return "Unknown"; case ADAPTER_TYPE_ETHERNET: