Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GoBackend: IPv6 handling

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Aurélien Chabot 2018-03-02 20:34:40 +11:00 committed by Jason A. Donenfeld
parent d97312b96a
commit 6878aba911
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/com/wireguard/android/backend/GoBackend.java
View File

@ -14,6 +14,7 @@ import com.wireguard.config.Interface;
import com.wireguard.config.Peer; import com.wireguard.config.Peer;
import com.wireguard.crypto.KeyEncoding; import com.wireguard.crypto.KeyEncoding;
import java.net.Inet4Address;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.Collections; import java.util.Collections;
@ -115,14 +116,31 @@ public final class GoBackend implements Backend {
return getState(tunnel); return getState(tunnel);
} }
private String ResolveSocketAddress(String string) throws Exception { private String parseEndpoint(String string) throws Exception {
String[] part = string.split(":", 2); String[] part;
if (string.charAt(0) == '[') { // ipv6
int end = string.indexOf(']');
if (end == -1 || string.charAt(end+1) != ':')
throw new Exception("Invalid endpoint " + string);
part = new String[2];
part[0] = string.substring(1, end);
part[1] = string.substring(end + 2);
Log.d(TAG, "PP " + part[0] + " " + part[1]);
} else { // ipv4
part = string.split(":", 2);
}
if (part.length != 2 || part[0].isEmpty() || part[1].isEmpty()) if (part.length != 2 || part[0].isEmpty() || part[1].isEmpty())
throw new Exception("Invalid socket address " + string); throw new Exception("Invalid endpoint " + string);
InetAddress address = InetAddress.getByName(part[0]); InetAddress address = InetAddress.getByName(part[0]);
int port = Integer.valueOf(part[1]); int port = Integer.valueOf(part[1]);
InetSocketAddress socketAddress = new InetSocketAddress(address, port); InetSocketAddress socketAddress = new InetSocketAddress(address, port);
if (socketAddress.getAddress() instanceof Inet4Address)
return socketAddress.getAddress().getHostAddress() + ":" + socketAddress.getPort(); return socketAddress.getAddress().getHostAddress() + ":" + socketAddress.getPort();
else
return "[" + socketAddress.getAddress().getHostAddress() + "]:" + socketAddress.getPort();
} }
private void setStateInternal(final Tunnel tunnel, final Config config, final State state) private void setStateInternal(final Tunnel tunnel, final Config config, final State state)
@ -156,7 +174,7 @@ public final class GoBackend implements Backend {
if (peer.getPreSharedKey() != null) if (peer.getPreSharedKey() != null)
fmt.format("preshared_key=%s\n", KeyEncoding.keyToHex(KeyEncoding.keyFromBase64(peer.getPreSharedKey()))); fmt.format("preshared_key=%s\n", KeyEncoding.keyToHex(KeyEncoding.keyFromBase64(peer.getPreSharedKey())));
if (peer.getEndpoint() != null) { if (peer.getEndpoint() != null) {
fmt.format("endpoint=%s\n", ResolveSocketAddress(peer.getEndpoint())); fmt.format("endpoint=%s\n", parseEndpoint(peer.getEndpoint()));
} }
if (peer.getPersistentKeepalive() != null) if (peer.getPersistentKeepalive() != null)
fmt.format("persistent_keepalive_interval=%d\n", Integer.parseInt(peer.getPersistentKeepalive())); fmt.format("persistent_keepalive_interval=%d\n", Integer.parseInt(peer.getPersistentKeepalive()));
@ -170,7 +188,8 @@ public final class GoBackend implements Backend {
// Create the vpn tunnel with android API // Create the vpn tunnel with android API
VpnService.Builder builder = vpnService.getBuilder(); VpnService.Builder builder = vpnService.getBuilder();
builder.setSession(tunnel.getName()); builder.setSession(tunnel.getName());
builder.addAddress(config.getInterface().getAddress(), 32); InetAddress address = InetAddress.getByName(config.getInterface().getAddress());
builder.addAddress(address.getHostAddress(), (address instanceof Inet4Address) ? 32 : 128);
if (config.getInterface().getDns() != null) if (config.getInterface().getDns() != null)
builder.addDnsServer(config.getInterface().getDns()); builder.addDnsServer(config.getInterface().getDns());