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

from last checkin - fix enforce proto default, fix http client delayed start

Browse Source
This commit is contained in:
zzz
2012-06-20 01:19:05 +00:00
parent e383477b01
commit d8a2e39006
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,6 +238,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
} }
//if (!defaultOpts.contains("i2p.streaming.inactivityTimeout")) //if (!defaultOpts.contains("i2p.streaming.inactivityTimeout"))
// defaultOpts.setProperty("i2p.streaming.inactivityTimeout", ""+DEFAULT_READ_TIMEOUT); // defaultOpts.setProperty("i2p.streaming.inactivityTimeout", ""+DEFAULT_READ_TIMEOUT);
// delayed start
verifySocketManager();
I2PSocketOptions opts = sockMgr.buildOptions(defaultOpts); I2PSocketOptions opts = sockMgr.buildOptions(defaultOpts);
if(!defaultOpts.containsKey(I2PSocketOptions.PROP_CONNECT_TIMEOUT)) { if(!defaultOpts.containsKey(I2PSocketOptions.PROP_CONNECT_TIMEOUT)) {
opts.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT); opts.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT);
@ -969,13 +971,12 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
return; return;
} }
//Properties opts = new Properties(); Properties opts = new Properties();
//opts.setProperty("i2p.streaming.inactivityTimeout", ""+120*1000); //opts.setProperty("i2p.streaming.inactivityTimeout", ""+120*1000);
// 1 == disconnect. see ConnectionOptions in the new streaming lib, which i // 1 == disconnect. see ConnectionOptions in the new streaming lib, which i
// dont want to hard link to here // dont want to hard link to here
//opts.setProperty("i2p.streaming.inactivityTimeoutAction", ""+1); //opts.setProperty("i2p.streaming.inactivityTimeoutAction", ""+1);
//I2PSocketOptions sktOpts = getDefaultOptions(opts); I2PSocketOptions sktOpts = getDefaultOptions(opts);
I2PSocketOptions sktOpts = getDefaultOptions();
if (remotePort > 0) if (remotePort > 0)
sktOpts.setPort(remotePort); sktOpts.setPort(remotePort);
I2PSocket i2ps = createI2PSocket(clientDest, sktOpts); I2PSocket i2ps = createI2PSocket(clientDest, sktOpts);

2
apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java
View File

@ -102,7 +102,7 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
* If PROTO is enforced, we cannot communicate with destinations earlier than version 0.7.1. * If PROTO is enforced, we cannot communicate with destinations earlier than version 0.7.1.
* @since 0.9.1 * @since 0.9.1
*/ */
private static final boolean DEFAULT_ENFORCE_PROTO = true; private static final boolean DEFAULT_ENFORCE_PROTO = false;
// Syncronization fix, but doing it this way causes NPE... // Syncronization fix, but doing it this way causes NPE...
// FIXME private final int _trend[] = new int[TREND_COUNT]; FIXME // FIXME private final int _trend[] = new int[TREND_COUNT]; FIXME