zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use "wildcard" instead of "unknown" for ADAPTER_TYPE_ANY in stats.

Browse Source 
TBR=hta@webrtc.org

Bug: None
Change-Id: I3ccff01f2ad51aebc1241fab2b41518b769adc8a
Reviewed-on: https://webrtc-review.googlesource.com/90800
Commit-Queue: Qingsi Wang <qingsi@google.com>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24120}
This commit is contained in:
Qingsi Wang
2018-07-26 10:44:02 -07:00
committed by Commit Bot
parent 1216371fce
commit 01560dead9
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pc/statscollector.cc
View File

@ -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 <typename ValueType>
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 "";

1
rtc_base/network.cc
View File

@ -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: