Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Unified Diff: webrtc/rtc_base/network_unittest.cc

Issue 2985133002: If adapter type is unknown and interface name is "ipsec", treat as VPN. (Closed)
Patch Set: Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/rtc_base/network.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/rtc_base/network_unittest.cc
diff --git a/webrtc/rtc_base/network_unittest.cc b/webrtc/rtc_base/network_unittest.cc
index a6c42ead37cd322f291b27b5a715d5049b1f58d1..73f199f6ca1f45b12fdab01c557a15d3b6aa1f0d 100644
--- a/webrtc/rtc_base/network_unittest.cc
+++ b/webrtc/rtc_base/network_unittest.cc
@@ -842,11 +842,17 @@ TEST_F(NetworkTest, TestGetAdapterTypeFromNameMatching) {
std::string ipv6_mask = "FFFF:FFFF:FFFF:FFFF::";
BasicNetworkManager manager;
-#if defined(WEBRTC_IOS)
- char if_name[20] = "pdp_ip0";
+ // IPSec interface; name is in form "ipsec<index>".
+ char if_name[20] = "ipsec11";
ifaddrs* addr_list =
InstallIpv6Network(if_name, ipv6_address1, ipv6_mask, manager);
+ EXPECT_EQ(ADAPTER_TYPE_VPN, GetAdapterType(manager));
+ ClearNetworks(manager);
+ ReleaseIfAddrs(addr_list);
+#if defined(WEBRTC_IOS)
+ strcpy(if_name, "pdp_ip0");
+ addr_list = InstallIpv6Network(if_name, ipv6_address1, ipv6_mask, manager);
EXPECT_EQ(ADAPTER_TYPE_CELLULAR, GetAdapterType(manager));
ClearNetworks(manager);
ReleaseIfAddrs(addr_list);
@@ -858,10 +864,8 @@ TEST_F(NetworkTest, TestGetAdapterTypeFromNameMatching) {
ReleaseIfAddrs(addr_list);
#elif defined(WEBRTC_ANDROID)
- char if_name[20] = "rmnet0";
- ifaddrs* addr_list =
- InstallIpv6Network(if_name, ipv6_address1, ipv6_mask, manager);
-
+ strcpy(if_name, "rmnet0");
+ addr_list = InstallIpv6Network(if_name, ipv6_address1, ipv6_mask, manager);
EXPECT_EQ(ADAPTER_TYPE_CELLULAR, GetAdapterType(manager));
ClearNetworks(manager);
ReleaseIfAddrs(addr_list);
@@ -878,9 +882,10 @@ TEST_F(NetworkTest, TestGetAdapterTypeFromNameMatching) {
ClearNetworks(manager);
ReleaseIfAddrs(addr_list);
#else
- char if_name[20] = "wlan0";
- ifaddrs* addr_list =
- InstallIpv6Network(if_name, ipv6_address1, ipv6_mask, manager);
+ // TODO(deadbeef): If not iOS or Android, "wlan0" should be treated as
+ // "unknown"? Why? This should be fixed if there's no good reason.
+ strcpy(if_name, "wlan0");
+ addr_list = InstallIpv6Network(if_name, ipv6_address1, ipv6_mask, manager);
EXPECT_EQ(ADAPTER_TYPE_UNKNOWN, GetAdapterType(manager));
ClearNetworks(manager);
« no previous file with comments | « webrtc/rtc_base/network.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698