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

i2ptunnel: Fix default shouldBundleReplyInfo setting for non-http servers

Browse Source
This commit is contained in:
zzz
2016-02-25 13:52:00 +00:00
parent 8e4b7e3847
commit f34a05c35d
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
View File

@ -79,7 +79,7 @@ public class TunnelController implements Logging {
public static final String PFX_OPTION = "option.";
private static final String OPT_PERSISTENT = PFX_OPTION + "persistentClientKey";
private static final String OPT_BUNDLE_REPLY = PFX_OPTION + "shouldBundleReplyInfo";
public static final String OPT_BUNDLE_REPLY = PFX_OPTION + "shouldBundleReplyInfo";
private static final String OPT_TAGS_SEND = PFX_OPTION + "crypto.tagsToSend";
private static final String OPT_LOW_TAGS = PFX_OPTION + "crypto.lowTagThreshold";
private static final String OPT_SIG_TYPE = PFX_OPTION + I2PClient.PROP_SIGTYPE;
@ -652,7 +652,11 @@ public class TunnelController implements Logging {
if (type.equals(TYPE_HTTP_SERVER) || type.equals(TYPE_STREAMR_SERVER)) {
if (!_config.containsKey(OPT_BUNDLE_REPLY))
_config.setProperty(OPT_BUNDLE_REPLY, "false");
} else if (type.contains("irc") || type.equals(TYPE_STREAMR_CLIENT)) {
} else if (!isClient(type)) {
// override UI that sets it to false
_config.setProperty(OPT_BUNDLE_REPLY, "true");
}
if (type.contains("irc") || type.equals(TYPE_STREAMR_CLIENT)) {
// maybe a bad idea for ircclient if DCC is enabled
if (!_config.containsKey(OPT_TAGS_SEND))
_config.setProperty(OPT_TAGS_SEND, "20");

7
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java
View File

@ -560,6 +560,13 @@ public class TunnelConfig {
}
}
// override bundle setting set above
if (!TunnelController.isClient(_type) &&
!TunnelController.TYPE_HTTP_SERVER.equals(_type) &&
!TunnelController.TYPE_STREAMR_SERVER.equals(_type)) {
config.setProperty(TunnelController.OPT_BUNDLE_REPLY, "true");
}
// generic proxy stuff
if (TunnelController.TYPE_HTTP_CLIENT.equals(_type) || TunnelController.TYPE_CONNECT.equals(_type) ||
TunnelController.TYPE_SOCKS.equals(_type) ||TunnelController.TYPE_SOCKS_IRC.equals(_type)) {