mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-12 21:30:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add field trial WebRTC-AllowMACBasedIPv6

Browse source 
Bug: webrtc:12268
Change-Id: I6fad191a12aa2834eb2f38b437781cba23785d5e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/196506
Commit-Queue: Jonas Oreland <jonaso@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32782}
This commit is contained in:
Jonas Oreland 2020-12-05 18:09:13 +01:00 committed by Commit Bot
parent 53becc67e1
commit 47fa08f90d
3 changed files with 50 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
rtc_base/network.cc
View file

@ -131,7 +131,7 @@ uint16_t ComputeNetworkCostByType(int type,
}
#if !defined(__native_client__)
bool IsIgnoredIPv6(const InterfaceAddress& ip) {
bool IsIgnoredIPv6(bool allow_mac_based_ipv6, const InterfaceAddress& ip) {
if (ip.family() != AF_INET6) {
return false;
}
@ -144,7 +144,7 @@ bool IsIgnoredIPv6(const InterfaceAddress& ip) {
}
// Any MAC based IPv6 should be avoided to prevent the MAC tracking.
if (IPIsMacBased(ip)) {
if (IPIsMacBased(ip) && !allow_mac_based_ipv6) {
return true;
}
@ -478,11 +478,15 @@ Network* NetworkManagerBase::GetNetworkFromAddress(
return nullptr;
}
BasicNetworkManager::BasicNetworkManager() {}
BasicNetworkManager::BasicNetworkManager()
: allow_mac_based_ipv6_(
webrtc::field_trial::IsEnabled("WebRTC-AllowMACBasedIPv6")) {}
BasicNetworkManager::BasicNetworkManager(
NetworkMonitorFactory* network_monitor_factory)
: network_monitor_factory_(network_monitor_factory) {}
: network_monitor_factory_(network_monitor_factory),
allow_mac_based_ipv6_(
webrtc::field_trial::IsEnabled("WebRTC-AllowMACBasedIPv6")) {}
BasicNetworkManager::~BasicNetworkManager() {}
@ -535,7 +539,7 @@ void BasicNetworkManager::ConvertIfAddrs(struct ifaddrs* interfaces,
// Special case for IPv6 address.
if (cursor->ifa_addr->sa_family == AF_INET6) {
if (IsIgnoredIPv6(ip)) {
if (IsIgnoredIPv6(allow_mac_based_ipv6_, ip)) {
continue;
}
scope_id =
@ -713,7 +717,7 @@ bool BasicNetworkManager::CreateNetworks(bool include_ignored,
scope_id = v6_addr->sin6_scope_id;
ip = IPAddress(v6_addr->sin6_addr);
if (IsIgnoredIPv6(InterfaceAddress(ip))) {
if (IsIgnoredIPv6(allow_mac_based_ipv6_, InterfaceAddress(ip))) {
continue;
}

1
rtc_base/network.h
View file

@ -293,6 +293,7 @@ class RTC_EXPORT BasicNetworkManager : public NetworkManagerBase,
nullptr;
std::unique_ptr<NetworkMonitorInterface> network_monitor_
RTC_GUARDED_BY(thread_);
bool allow_mac_based_ipv6_ = false;
};
// Represents a Unix-type network interface, with a name and single address.

39
rtc_base/network_unittest.cc
View file

@ -33,6 +33,7 @@
#if defined(WEBRTC_WIN)
#include "rtc_base/logging.h" // For RTC_LOG_GLE
#endif
#include "test/field_trial.h"
using ::testing::Contains;
using ::testing::Not;
@ -1240,4 +1241,42 @@ TEST_F(NetworkTest, TestWhenNetworkListChangeReturnsChangedFlag) {
}
}
#if defined(WEBRTC_POSIX)
TEST_F(NetworkTest, IgnoresMACBasedIPv6Address) {
std::string ipv6_address = "2607:fc20:f340:1dc8:214:22ff:fe01:2345";
std::string ipv6_mask = "FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF";
BasicNetworkManager manager;
manager.StartUpdating();
// IPSec interface; name is in form "ipsec<index>".
char if_name[20] = "ipsec11";
ifaddrs* addr_list =
InstallIpv6Network(if_name, ipv6_address, ipv6_mask, manager);
BasicNetworkManager::NetworkList list;
manager.GetNetworks(&list);
EXPECT_EQ(list.size(), 0u);
ReleaseIfAddrs(addr_list);
}
TEST_F(NetworkTest, WebRTC_AllowMACBasedIPv6Address) {
webrtc::test::ScopedFieldTrials field_trials(
"WebRTC-AllowMACBasedIPv6/Enabled/");
std::string ipv6_address = "2607:fc20:f340:1dc8:214:22ff:fe01:2345";
std::string ipv6_mask = "FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF";
BasicNetworkManager manager;
manager.StartUpdating();
// IPSec interface; name is in form "ipsec<index>".
char if_name[20] = "ipsec11";
ifaddrs* addr_list =
InstallIpv6Network(if_name, ipv6_address, ipv6_mask, manager);
BasicNetworkManager::NetworkList list;
manager.GetNetworks(&list);
EXPECT_EQ(list.size(), 1u);
ReleaseIfAddrs(addr_list);
}
#endif
} // namespace rtc