From 7ec9e6519b7008cf216a2686065b4e24b6c1948c Mon Sep 17 00:00:00 2001 From: Antoine Debuisson Date: Thu, 21 Nov 2024 13:19:17 +0100 Subject: [PATCH] add getLocalPort to socks server --- .../AnonymousSocks5ServerImpl.java | 20 +++++++++++++------ .../socks5server/AnonymousSocks5Server.java | 8 ++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/modules/authenticated-socks-module/src/main/java/org/simplejavamail/internal/authenticatedsockssupport/socks5server/AnonymousSocks5ServerImpl.java b/modules/authenticated-socks-module/src/main/java/org/simplejavamail/internal/authenticatedsockssupport/socks5server/AnonymousSocks5ServerImpl.java index ceab37222..233082124 100644 --- a/modules/authenticated-socks-module/src/main/java/org/simplejavamail/internal/authenticatedsockssupport/socks5server/AnonymousSocks5ServerImpl.java +++ b/modules/authenticated-socks-module/src/main/java/org/simplejavamail/internal/authenticatedsockssupport/socks5server/AnonymousSocks5ServerImpl.java @@ -1,11 +1,5 @@ package org.simplejavamail.internal.authenticatedsockssupport.socks5server; -import org.simplejavamail.api.internal.authenticatedsockssupport.common.Socks5Bridge; -import org.simplejavamail.api.internal.authenticatedsockssupport.socks5server.AnonymousSocks5Server; -import org.simplejavamail.internal.authenticatedsockssupport.common.SocksException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.IOException; import java.net.InetSocketAddress; import java.net.ServerSocket; @@ -13,6 +7,12 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import org.simplejavamail.api.internal.authenticatedsockssupport.common.Socks5Bridge; +import org.simplejavamail.api.internal.authenticatedsockssupport.socks5server.AnonymousSocks5Server; +import org.simplejavamail.internal.authenticatedsockssupport.common.SocksException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @see AnonymousSocks5Server */ @@ -102,4 +102,12 @@ public boolean isStopping() { public boolean isRunning() { return running; } + + @Override + public int getLocalPort() { + if (serverSocket == null) { + return -1; + } + return serverSocket.getLocalPort(); + } } \ No newline at end of file diff --git a/modules/core-module/src/main/java/org/simplejavamail/api/internal/authenticatedsockssupport/socks5server/AnonymousSocks5Server.java b/modules/core-module/src/main/java/org/simplejavamail/api/internal/authenticatedsockssupport/socks5server/AnonymousSocks5Server.java index 4261a2d42..eda305a52 100644 --- a/modules/core-module/src/main/java/org/simplejavamail/api/internal/authenticatedsockssupport/socks5server/AnonymousSocks5Server.java +++ b/modules/core-module/src/main/java/org/simplejavamail/api/internal/authenticatedsockssupport/socks5server/AnonymousSocks5Server.java @@ -17,4 +17,12 @@ public interface AnonymousSocks5Server extends Runnable { boolean isStopping(); boolean isRunning(); + + /** + * Returns the port number on which this server is listening. + * + * @return the port number to which this server is listening or + * -1 if the server is not started yet. + */ + int getLocalPort(); }