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

Implement network monitor for iOS.

Browse Source 
Notably, this should detect whether an interface is "available" or not,
which should prevent the failure is with dual SIM card setups.

This is gated behind a field trial for now, to ensure this doesn't cause
any regressions due to false negatives (interfaces that are usable
but not listed as available by NWPathMonitor).

Bug: webrtc:10966
Change-Id: Ia3942c4c57b525d08d8b340e2325f3705cfd0304
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180923
Commit-Queue: Taylor <deadbeef@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Jonas Oreland <jonaso@webrtc.org>
Reviewed-by: Anders Carlsson <andersc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31977}
This commit is contained in:
Taylor Brandstetter
2020-08-19 16:41:54 -07:00
committed by Commit Bot
parent bedb605c82
commit ea7fbfb966
17 changed files with 549 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
rtc_base/network_unittest.cc
View File

@ -12,9 +12,11 @@
#include <stdlib.h>
#include <algorithm>
#include <memory>
#include <vector>
#include "absl/algorithm/container.h"
#include "absl/strings/match.h"
#include "rtc_base/checks.h"
#include "rtc_base/net_helpers.h"
@ -61,8 +63,18 @@ class FakeNetworkMonitor : public NetworkMonitorBase {
return NetworkPreference::NEUTRAL;
}
bool IsAdapterAvailable(const std::string& if_name) override {
return absl::c_count(unavailable_adapters_, if_name) == 0;
}
// Used to test IsAdapterAvailable.
void set_unavailable_adapters(std::vector<std::string> unavailable_adapters) {
unavailable_adapters_ = unavailable_adapters;
}
private:
bool started_ = false;
std::vector<std::string> unavailable_adapters_;
};
class FakeNetworkMonitorFactory : public NetworkMonitorFactory {
@ -914,6 +926,41 @@ TEST_F(NetworkTest, TestGetAdapterTypeFromNameMatching) {
ReleaseIfAddrs(addr_list);
#endif
}
// Test that an adapter won't be included in the network list if there's a
// network monitor that says it's unavailable.
TEST_F(NetworkTest, TestNetworkMonitorIsAdapterAvailable) {
char if_name1[20] = "pdp_ip0";
char if_name2[20] = "pdp_ip1";
ifaddrs* list = nullptr;
list = AddIpv6Address(list, if_name1, "1000:2000:3000:4000:0:0:0:1",
"FFFF:FFFF:FFFF:FFFF::", 0);
list = AddIpv6Address(list, if_name2, "1000:2000:3000:4000:0:0:0:2",
"FFFF:FFFF:FFFF:FFFF::", 0);
NetworkManager::NetworkList result;
// Sanity check that both interfaces are included by default.
FakeNetworkMonitorFactory factory;
BasicNetworkManager manager(&factory);
manager.StartUpdating();
CallConvertIfAddrs(manager, list, /*include_ignored=*/false, &result);
EXPECT_EQ(2u, result.size());
bool changed;
// This ensures we release the objects created in CallConvertIfAddrs.
MergeNetworkList(manager, result, &changed);
result.clear();
// Now simulate one interface being unavailable.
FakeNetworkMonitor* network_monitor = GetNetworkMonitor(manager);
network_monitor->set_unavailable_adapters({if_name1});
CallConvertIfAddrs(manager, list, /*include_ignored=*/false, &result);
EXPECT_EQ(1u, result.size());
EXPECT_EQ(if_name2, result[0]->name());
MergeNetworkList(manager, result, &changed);
ReleaseIfAddrs(list);
}
#endif // defined(WEBRTC_POSIX)
// Test MergeNetworkList successfully combines all IPs for the same