1 files changed, 9 insertions, 1 deletions
diff --git a/tunnel/src/main/java/com/wireguard/config/InetEndpoint.java b/tunnel/src/main/java/com/wireguard/config/InetEndpoint.java
index 86f5f9a8..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))
@@ -82,7 +86,11 @@ public final class InetEndpoint {
     }
 
     public Optional<InetEndpoint> getResolved() {
-        return Optional.ofNullable(resolved);
+        if (isResolved) {
+            return Optional.of(this);
+        } else {
+            return Optional.ofNullable(resolved);
+        }
     }
 
     /**