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

i2ptunnel: Return 503 from HTTP client on failure to build tunnels

Browse Source 
previously just closed the socket
This commit is contained in:
zzz
2023-01-15 10:37:55 -05:00
parent 522cf05880
commit acec9b5275
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
View File

@@ -270,6 +270,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
* Warning, this does not make a copy of I2PTunnel's client options,
* it modifies them directly.
* unused?
*
* This will throw IAE on tunnel build failure
*/
@Override
protected I2PSocketOptions getDefaultOptions() {
@@ -293,6 +295,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
* Warning, this does not make a copy of I2PTunnel's client options,
* it modifies them directly.
* Do not use overrides for per-socket options.
*
* This will throw IAE on tunnel build failure
*/
@Override
protected I2PSocketOptions getDefaultOptions(Properties overrides) {
@@ -1379,7 +1383,21 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
// 1 == disconnect. see ConnectionOptions in the new streaming lib, which i
// dont want to hard link to here
//opts.setProperty("i2p.streaming.inactivityTimeoutAction", ""+1);
I2PSocketOptions sktOpts = getDefaultOptions(opts);
I2PSocketOptions sktOpts;
try {
sktOpts = getDefaultOptions(opts);
} catch (RuntimeException re) {
// tunnel build failure
StringBuilder buf = new StringBuilder(128);
buf.append("HTTP/1.1 503 Service Unavailable");
if (re.getMessage() != null)
buf.append(" - ").append(re.getMessage());
buf.append("\r\n\r\n");
try {
out.write(buf.toString().getBytes("UTF-8"));
} catch (IOException ioe) {}
throw re;
}
if (remotePort > 0)
sktOpts.setPort(remotePort);
i2ps = createI2PSocket(clientDest, sktOpts);