10000 Merge pull request #563 from varyoo/add-socks-port · bbottema/simple-java-mail@2ab2e71 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2ab2e71

Browse files
bbottemabbottema
authored
Merge pull request #563 from varyoo/add-socks-port
[Authenticated SOCKS module] Let the OS allocate an ephemeral port
2 parents bfe1853 + 7ec9e65 commit 2ab2e71

File tree

2 files changed

+22
-6
lines changed

2 files changed

+22
-6
lines changed

‎modules/authenticated-socks-module/src/main/java/org/simplejavamail/internal/authenticatedsockssupport/socks5server/AnonymousSocks5ServerImpl.java

+14-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package org.simplejavamail.internal.authenticatedsockssupport.socks5server;
22

3-
import org.simplejavamail.api.internal.authenticatedsockssupport.common.Socks5Bridge;
4-
import org.simplejavamail.api.internal.authenticatedsockssupport.socks5server.AnonymousSocks5Server;
5-
import org.simplejavamail.internal.authenticatedsockssupport.common.SocksException;
6-
import org.slf4j.Logger;
7-
import org.slf4j.LoggerFactory;
8-
93
import java.io.IOException;
104
import java.net.InetSocketAddress;
115
import java.net.ServerSocket;
126
import java.net.Socket;
137
import java.util.concurrent.ExecutorService;
148
import java.util.concurrent.Executors;
159

10+
import org.simplejavamail.api.internal.authenticatedsockssupport.common.Socks5Bridge;
11+
import org.simplejavamail.api.internal.authenticatedsockssupport.socks5server.AnonymousSocks5Server;
12+
import org.simplejavamail.internal.authenticatedsockssupport.common.SocksException;
13+
import org.slf4j.Logger;
14+
import org.slf4j.LoggerFactory;
15+
1616
/**
1717
* @see AnonymousSocks5Server
1818
*/
@@ -102,4 +102,12 @@ public boolean isStopping() {
102102
public boolean isRunning() {
103103
return running;
104104
}
105+
106+
@Override
107+
public int getLocalPort() {
108+
if (serverSocket == null) {
109+
return -1;
110+
}
111+
return serverSocket.getLocalPort();
112+
}
105113
}

‎modules/core-module/src/main/java/org/simplejavamail/api/internal/authenticatedsockssupport/socks5server/AnonymousSocks5Server.java

+8
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,12 @@ public interface AnonymousSocks5Server extends Runnable {
1717
boolean isStopping();
1818

1919
boolean isRunning();
20+
21+
/**
22+
* Returns the port number on which this server is listening.
23+
*
24+
* @return the port number to which this server is listening or
25+
* -1 if the server is not started yet.
26+
*/
27+
int getLocalPort();
2028
}

0 commit comments

Comments
 (0)
0