AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i2ptunnel: Return error message from IRC client on failure to build tunnels

Browse Source 
previously just closed the socket
This commit is contained in:
zzz
2023-01-15 12:38:00 -05:00
parent 19e3122f48
commit 399575aba5
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java
View File

@@ -137,7 +137,18 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase {
if (clientDest == null) if (clientDest == null)
throw new UnknownHostException("Could not resolve " + addr.getHostName()); throw new UnknownHostException("Could not resolve " + addr.getHostName());
int port = addr.getPort(); int port = addr.getPort();
i2ps = createI2PSocket(clientDest, port); try {
i2ps = createI2PSocket(clientDest, port);
} catch (RuntimeException re) {
// tunnel build failure
_log.error("Error connecting", re);
try {
String name = addr != null ? addr.getHostName() : "undefined";
String msg = ":" + name + " 499 you :" + re.getMessage() + "\r\n";
s.getOutputStream().write(DataHelper.getUTF8(msg));
} catch (IOException ioe) {}
throw re;
}
i2ps.setReadTimeout(readTimeout); i2ps.setReadTimeout(readTimeout);
StringBuffer expectedPong = new StringBuffer(); StringBuffer expectedPong = new StringBuffer();
DCCHelper dcc = _dccEnabled ? new DCC(s.getLocalAddress().getAddress()) : null; DCCHelper dcc = _dccEnabled ? new DCC(s.getLocalAddress().getAddress()) : null;