tunnel: add ConfigDetail and PeerDetail

3 files changed, 25 insertions, 0 deletions

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 1790d227..4176bcff 100644
--- a/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
@@ -636,6 +636,9 @@ public final class GoBackend implements Backend {
                     final InetEndpoint ep = peer.getEndpoint().orElse(null);
                     if (ep == null)
                         continue;
+                    // FIXME
+                    tunnel.onEndpointChange(peer.getPublicKey(), ep);
+                    Log.i(TAG, "onEndpointChange " + peer.getPublicKey() + ", " + ep);
                     if (ep.getResolved(resolver, true).orElse(null) == null) {
                         if (i < DNS_RESOLUTION_RETRIES - 1) {
                             Log.w(TAG, "DNS host \"" + ep.getHost() + "\" failed to resolve; trying again");
diff --git a/tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java b/tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java
index 6c0f54e3..fc94375b 100644
--- a/tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java
@@ -5,8 +5,14 @@
 
 package com.wireguard.android.backend;
 
+import androidx.annotation.Nullable;
+
+import com.wireguard.config.InetEndpoint;
+import com.wireguard.config.InetNetwork;
+import com.wireguard.crypto.Key;
 import com.wireguard.util.NonNullForAll;
 
+import java.util.List;
 import java.util.regex.Pattern;
 
 /**
@@ -61,4 +67,8 @@ public interface Tunnel {
      * @param newDhcp The new DHCP info of the tunnel.
      */
     void onDhcpChange(Dhcp newDhcp);
+
+    void onEndpointChange(Key publicKey, @Nullable InetEndpoint newEndpoint);
+
+    void onAllowedIpsChange(Key publicKey, @Nullable List<InetNetwork> addNetworks, @Nullable List<InetNetwork> removeNetworks);
 }
diff --git a/tunnel/src/main/java/com/wireguard/config/InetEndpoint.java b/tunnel/src/main/java/com/wireguard/config/InetEndpoint.java
index 9d087cd6..dffd534b 100644
--- a/tunnel/src/main/java/com/wireguard/config/InetEndpoint.java
+++ b/tunnel/src/main/java/com/wireguard/config/InetEndpoint.java
@@ -65,6 +65,10 @@ public final class InetEndpoint {
         }
     }
 
+    public static InetEndpoint fromAddress(final InetAddress address, final int port) {
+        return new InetEndpoint(address.getHostAddress(), true, port);
+    }
+
     @Override
     public boolean equals(final Object obj) {
         if (!(obj instanceof InetEndpoint))
@@ -81,6 +85,14 @@ public final class InetEndpoint {
         return port;
     }
 
+    public Optional<InetEndpoint> getResolved() {
+        if (isResolved) {
+            return Optional.of(this);
+        } else {
+            return Optional.ofNullable(resolved);
+        }
+    }
+
     /**
      * Generate an {@code InetEndpoint} instance with the same port and the host resolved using DNS
      * to a numeric address. If the host is already numeric, the existing instance may be returned.