tunnel: support dynamic updates of allowed-ips in Go backend

3 files changed, 34 insertions, 0 deletions

diff --git a/tunnel/src/main/java/com/wireguard/android/backend/Backend.java b/tunnel/src/main/java/com/wireguard/android/backend/Backend.java
index edf98b9e..5ffdf8e2 100644
--- a/tunnel/src/main/java/com/wireguard/android/backend/Backend.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/Backend.java
@@ -6,8 +6,11 @@
 package com.wireguard.android.backend;
 
 import com.wireguard.config.Config;
+import com.wireguard.config.InetNetwork;
+import com.wireguard.crypto.Key;
 import com.wireguard.util.NonNullForAll;
 
+import java.util.List;
 import java.util.Set;
 
 import androidx.annotation.Nullable;
@@ -64,4 +67,6 @@ public interface Backend {
      * @throws Exception Exception raised while changing state.
      */
     Tunnel.State setState(Tunnel tunnel, Tunnel.State state, @Nullable Config config) throws Exception;
+
+    void addAllowedIps(Tunnel tunnel, Key publicKey, List<InetNetwork> addNetworks);
 }
diff --git a/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java b/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
index c5dd2044..894059c7 100644
--- a/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
@@ -314,6 +314,29 @@ public final class GoBackend implements Backend {
         return getState(tunnel);
     }
 
+    @Override
+    public void addAllowedIps(Tunnel tunnel, Key publicKey, List<InetNetwork> addNetworks) {
+        if (tunnel != currentTunnel) {
+            // TODO logerror and/or return error/throw.
+            return;
+        }
+
+        StringBuffer sb = new StringBuffer();
+        sb.append("public_key=").append(publicKey.toHex()).append('\n');
+        for (final InetNetwork allowedIp: addNetworks) {
+            sb.append("allowed_ip=").append(allowedIp).append('\n');
+        }
+
+        String goConfig = sb.toString();
+        // TODO removed removeNetworks
+        Log.w(TAG, "Wg user string: " + goConfig);
+
+        LibwgGrpc.LibwgBlockingStub stub = LibwgGrpc.newBlockingStub(channel);
+        TunnelHandle handle = TunnelHandle.newBuilder().setHandle(currentTunnelHandle).build();
+        IpcSetRequest request = IpcSetRequest.newBuilder().setTunnel(handle).setConfig(goConfig).build();
+        IpcSetResponse resp = stub.ipcSet(request);
+    }
+
     private static String downloadPacFile(Network network, Uri pacFileUrl) {
         HttpURLConnection urlConnection = null;
         StringBuffer buf = new StringBuffer();
diff --git a/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java b/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
index 123e5a45..a0049afd 100644
--- a/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
@@ -14,6 +14,7 @@ import com.wireguard.android.backend.Tunnel.State;
 import com.wireguard.android.util.RootShell;
 import com.wireguard.android.util.ToolsInstaller;
 import com.wireguard.config.Config;
+import com.wireguard.config.InetNetwork;
 import com.wireguard.crypto.Key;
 import com.wireguard.util.NonNullForAll;
 
@@ -166,6 +167,11 @@ public final class WgQuickBackend implements Backend {
         return state;
     }
 
+    @Override
+    public void addAllowedIps(Tunnel tunnel, Key publicKey, List<InetNetwork> addNetworks) {
+        throw new RuntimeException("Not implemented");
+    }
+
     private void setStateInternal(final Tunnel tunnel, @Nullable final Config config, final State state) throws Exception {
         Log.i(TAG, "Bringing tunnel " + tunnel.getName() + ' ' + state);