From 61d4f17f5deb76b9e8a26fc125562c7f621d65d9 Mon Sep 17 00:00:00 2001 From: Zhao Gang Date: Mon, 13 Aug 2018 23:12:42 +0800 Subject: [PATCH] config: fix wrong Peer endpoint string format When a tunnel is running, saving the tunnel's config with an IPv6 address endpoint like [::1]:42 would result in the wrong format ::1:42. This patch fixes it. For endpoints with an IPv6 address(e.g. [::1]:42). Since the default endpoint InetSocketAddress is created unresolved, getEndpointString() returns "[::1]:42" (InetSocketAddress.getHostString() returns the literal hostname). After the endpoint is resolved, getEndpointString() returns "::1:42" (InetSocketAddress.getHostString() returns the IPv6 address without the square brackets). This inconsistent return values caused the above mentioned bug. With this patch, function getEndpointString would return the right format string whether the endpoint is resolved or not. Signed-off-by: Zhao Gang Signed-off-by: Jason A. Donenfeld --- app/src/main/java/com/wireguard/config/Peer.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/wireguard/config/Peer.java b/app/src/main/java/com/wireguard/config/Peer.java index 49c8b70e..b65f52cb 100644 --- a/app/src/main/java/com/wireguard/config/Peer.java +++ b/app/src/main/java/com/wireguard/config/Peer.java @@ -71,7 +71,10 @@ public class Peer { private String getEndpointString() { if (endpoint == null) return null; - return String.format("%s:%d", endpoint.getHostString(), endpoint.getPort()); + if (endpoint.getHostString().contains(":") && !endpoint.getHostString().contains("[")) + return String.format("[%s]:%d", endpoint.getHostString(), endpoint.getPort()); + else + return String.format("%s:%d", endpoint.getHostString(), endpoint.getPort()); } public int getPersistentKeepalive() {