diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/net/base/ip_address.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/net/base/ip_address.cc')
| -rw-r--r-- | chromium/net/base/ip_address.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/chromium/net/base/ip_address.cc b/chromium/net/base/ip_address.cc index 03a4df02dfc..ec095c44934 100644 --- a/chromium/net/base/ip_address.cc +++ b/chromium/net/base/ip_address.cc @@ -22,6 +22,8 @@ namespace net { namespace { +bool g_consider_loopback_ip_to_be_publicly_routable_for_testing = false; + // The prefix for IPv6 mapped IPv4 addresses. // https://tools.ietf.org/html/rfc4291#section-2.5.5.2 constexpr uint8_t kIPv4MappedPrefix[] = {0, 0, 0, 0, 0, 0, @@ -234,6 +236,11 @@ bool IPAddress::IsValid() const { } bool IPAddress::IsPubliclyRoutable() const { + if (g_consider_loopback_ip_to_be_publicly_routable_for_testing && + IsLoopback()) { + return true; + } + if (IsIPv4()) { return IsPubliclyRoutableIPv4(ip_address_); } else if (IsIPv6()) { @@ -242,6 +249,11 @@ bool IPAddress::IsPubliclyRoutable() const { return true; } +// static +void IPAddress::ConsiderLoopbackIPToBePubliclyRoutableForTesting() { + g_consider_loopback_ip_to_be_publicly_routable_for_testing = true; +} + bool IPAddress::IsZero() const { for (auto x : ip_address_) { if (x != 0) |