diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2020-04-10 10:26:26 +0000 |
|---|---|---|
| committer | Chalard Jean <jchalard@google.com> | 2020-04-10 11:48:12 +0000 |
| commit | 3ca1ff17e22563682167b38acef28d8ab6087ada (patch) | |
| tree | 06bc5c6c8d925cead3c117764e79577784bcd29c /src/android/net/util/NetworkStackUtils.java | |
| parent | c3d9f7160011ae95ce948cad815cdf6377d1c2da (diff) | |
Refine DNS private IP probes
This addresses comments on the parent change that introduced the
optional feature.
This change also considers IPv6 ULAs as private addresses, corrects some
style and comments.
Bug: 136734947
Test: atest NetworkStackTests:NetworkMonitorTest \
NetworkStackTests:NetworkStackUtilsTest
Change-Id: I1169320f3a5c09631e754518c60acab337faf49b
Merged-In: If4231804b77143b78f26a32c16db53fc4ac44cd8
(cherry picked from commit 0f62e8c6d21afd28280dbae7c3ea216097def466, aosp/1282802)
Diffstat (limited to 'src/android/net/util/NetworkStackUtils.java')
| -rwxr-xr-x | src/android/net/util/NetworkStackUtils.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/android/net/util/NetworkStackUtils.java b/src/android/net/util/NetworkStackUtils.java index 2de18de..6fd6043 100755 --- a/src/android/net/util/NetworkStackUtils.java +++ b/src/android/net/util/NetworkStackUtils.java @@ -385,4 +385,12 @@ public class NetworkStackUtils { (address instanceof Inet6Address) ? "[%s]:%d" : "%s:%d", address.getHostAddress(), port); } + + /** + * Return true if the provided address is non-null and an IPv6 Unique Local Address (RFC4193). + */ + public static boolean isIPv6ULA(@Nullable InetAddress addr) { + return addr instanceof Inet6Address + && ((addr.getAddress()[0] & 0xfe) == 0xfc); + } } |