Merge pull request #311 from ropalka/XNIO-425_3.8

[XNIO-425] Use user provided XNIO client bind address (if available) when creating secured connections
xnio · Oct 18, 2023 · 19baf00 · 19baf00
2 parents 75cdba5 + 61a6ec8
commit 19baf00
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/api/src/main/java/org/xnio/XnioIoThread.java b/api/src/main/java/org/xnio/XnioIoThread.java
@@ -40,6 +40,8 @@
  */
 @SuppressWarnings("unused")
 public abstract class XnioIoThread extends Thread implements XnioExecutor, XnioIoFactory {
+
+    private static final InetSocketAddress ANY_INET_ADDRESS = new InetSocketAddress(0);
     private final XnioWorker worker;
     private final int number;
 
@@ -261,6 +263,8 @@ public IoFuture<StreamConnection> openStreamConnection(SocketAddress bindAddress
             throw msg.mismatchSockType(bindAddress.getClass(), destination.getClass());
         }
         if (destination instanceof InetSocketAddress) {
+            final InetSocketAddress configuredAddress = ANY_INET_ADDRESS.equals(bindAddress) ? getWorker().getBindAddressTable().get(((InetSocketAddress) destination).getAddress()) : null;
+            bindAddress = configuredAddress != null ? configuredAddress : bindAddress;
             return openTcpStreamConnection((InetSocketAddress) bindAddress, (InetSocketAddress) destination, openListener, bindListener, optionMap);
         } else if (destination instanceof LocalSocketAddress) {
             return openLocalStreamConnection((LocalSocketAddress) bindAddress, (LocalSocketAddress) destination, openListener, bindListener, optionMap);