diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-10-01 17:13:14 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-10-01 17:13:14 +0200 |
| commit | c23d58bc27cf9807fc3405c8c99cc67cf4b21f25 (patch) | |
| tree | 2e3e0d2cb738b1a904b7005526dbd6f11bbeb94c /app/src/main/java/com/wireguard/config/InetEndpoint.java | |
| parent | 49a9475c4a2d87638f4801fd1dd8a66ac46edb16 (diff) | |
Peer: prefer v4 endpoints to v6
This works around DNS64 XLAT changeovers.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'app/src/main/java/com/wireguard/config/InetEndpoint.java')
| -rw-r--r-- | app/src/main/java/com/wireguard/config/InetEndpoint.java | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/app/src/main/java/com/wireguard/config/InetEndpoint.java b/app/src/main/java/com/wireguard/config/InetEndpoint.java new file mode 100644 index 00000000..4896ee97 --- /dev/null +++ b/app/src/main/java/com/wireguard/config/InetEndpoint.java @@ -0,0 +1,71 @@ +/* + * Copyright © 2017-2018 WireGuard LLC. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +package com.wireguard.config; + +import android.annotation.SuppressLint; + +import com.wireguard.android.Application; +import com.wireguard.android.R; + +import java.net.Inet4Address; +import java.net.InetAddress; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.UnknownHostException; + +import javax.annotation.Nullable; + +public class InetEndpoint { + private final String host; + private final int port; + @Nullable private InetAddress resolvedHost; + + public InetEndpoint(@Nullable final String endpoint) { + if (endpoint.indexOf('/') != -1 || endpoint.indexOf('?') != -1 || endpoint.indexOf('#') != -1) + throw new IllegalArgumentException(Application.get().getString(R.string.tunnel_error_forbidden_endpoint_chars)); + final URI uri; + try { + uri = new URI("wg://" + endpoint); + } catch (final URISyntaxException e) { + throw new IllegalArgumentException(e); + } + host = uri.getHost(); + port = uri.getPort(); + } + + public String getHost() { + return host; + } + + public int getPort() { + return port; + } + + @SuppressLint("DefaultLocale") + public String getResolvedEndpoint() throws UnknownHostException { + if (resolvedHost == null) { + final InetAddress[] candidates = InetAddress.getAllByName(host); + if (candidates.length == 0) + throw new UnknownHostException(host); + for (final InetAddress addr : candidates) { + if (addr instanceof Inet4Address) { + resolvedHost = addr; + break; + } + } + if (resolvedHost == null) + resolvedHost = candidates[0]; + } + return String.format(resolvedHost instanceof Inet4Address ? + "[%s]:%d" : "%s:%d", resolvedHost.getHostAddress(), port); + } + + @SuppressLint("DefaultLocale") + public String getEndpoint() { + return String.format(host.contains(":") && !host.contains("[") ? + "[%s]:%d" : "%s:%d", host, port); + } +} |