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

i2ptunnel: Set defaults for limits

Browse Source
This commit is contained in:
zzz
2018-01-17 16:23:54 +00:00
parent 889b5ae280
commit efe3696aa2
3 changed files with 81 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,6 +86,25 @@ public class TunnelController implements Logging {
public static final String PROP_TARGET_PORT = "targetPort";
public static final String PROP_TYPE = "type";
/**
* all of these are @since 0.9.33 (moved from TunnelConfig)
*/
public static final String PROP_MAX_CONNS_MIN = "i2p.streaming.maxConnsPerMinute";
public static final String PROP_MAX_CONNS_HOUR = "i2p.streaming.maxConnsPerHour";
public static final String PROP_MAX_CONNS_DAY = "i2p.streaming.maxConnsPerDay";
public static final String PROP_MAX_TOTAL_CONNS_MIN = "i2p.streaming.maxTotalConnsPerMinute";
public static final String PROP_MAX_TOTAL_CONNS_HOUR = "i2p.streaming.maxTotalConnsPerHour";
public static final String PROP_MAX_TOTAL_CONNS_DAY = "i2p.streaming.maxTotalConnsPerDay";
public static final String PROP_MAX_STREAMS = "i2p.streaming.maxConcurrentStreams";
public static final String PROP_LIMITS_SET = "i2p.streaming.limitsManuallySet";
public static final int DEFAULT_MAX_CONNS_MIN = 10;
public static final int DEFAULT_MAX_CONNS_HOUR = 40;
public static final int DEFAULT_MAX_CONNS_DAY = 100;
public static final int DEFAULT_MAX_TOTAL_CONNS_MIN = 25;
public static final int DEFAULT_MAX_TOTAL_CONNS_HOUR = 0;
public static final int DEFAULT_MAX_TOTAL_CONNS_DAY = 0;
public static final int DEFAULT_MAX_STREAMS = 20;
/** @since 0.9.14 */
public static final String PFX_OPTION = "option.";
@ -97,6 +116,20 @@ public class TunnelController implements Logging {
/** @since 0.9.30 */
private static final String OPT_ALT_PKF = PFX_OPTION + I2PTunnelServer.PROP_ALT_PKF;
/**
* all of these are @since 0.9.33
*/
private static final String OPT_MAX_CONNS_MIN = PFX_OPTION + PROP_MAX_CONNS_MIN;
private static final String OPT_MAX_CONNS_HOUR = PFX_OPTION + PROP_MAX_CONNS_HOUR;
private static final String OPT_MAX_CONNS_DAY = PFX_OPTION + PROP_MAX_CONNS_DAY;
private static final String OPT_MAX_TOTAL_CONNS_MIN = PFX_OPTION + PROP_MAX_TOTAL_CONNS_MIN;
private static final String OPT_MAX_TOTAL_CONNS_HOUR = PFX_OPTION + PROP_MAX_TOTAL_CONNS_HOUR;
private static final String OPT_MAX_TOTAL_CONNS_DAY = PFX_OPTION + PROP_MAX_TOTAL_CONNS_DAY;
private static final String OPT_MAX_STREAMS = PFX_OPTION + PROP_MAX_STREAMS;
private static final String OPT_LIMITS_SET = PFX_OPTION + PROP_LIMITS_SET;
public static final String OPT_POST_MAX = PFX_OPTION + I2PTunnelHTTPServer.OPT_POST_MAX;
public static final String OPT_POST_TOTAL_MAX = PFX_OPTION + I2PTunnelHTTPServer.OPT_POST_TOTAL_MAX;
/** all of these @since 0.9.14 */
public static final String TYPE_CONNECT = "connectclient";
public static final String TYPE_HTTP_BIDIR_SERVER = "httpbidirserver";
@ -790,6 +823,34 @@ public class TunnelController implements Logging {
if (!_config.containsKey(OPT_SIG_TYPE))
_config.setProperty(OPT_SIG_TYPE, PREFERRED_SIGTYPE.name());
}
if (!isClient(type)) {
String p1 = _config.getProperty(OPT_MAX_CONNS_MIN, "0");
String p2 = _config.getProperty(OPT_MAX_CONNS_HOUR, "0");
String p3 = _config.getProperty(OPT_MAX_CONNS_DAY, "0");
String p4 = _config.getProperty(OPT_MAX_TOTAL_CONNS_MIN, "0");
String p5 = _config.getProperty(OPT_MAX_TOTAL_CONNS_HOUR, "0");
String p6 = _config.getProperty(OPT_MAX_TOTAL_CONNS_DAY, "0");
String p7 = _config.getProperty(OPT_MAX_STREAMS, "0");
String p8 = _config.getProperty(OPT_LIMITS_SET, "false");
if (p1.equals("0") && p2.equals("0") && p3.equals("0") &&
p4.equals("0") && p5.equals("0") && p6.equals("0") &&
p7.equals("0") && !p8.equals("true")) {
// No limits set, let's set some defaults
_config.setProperty(OPT_MAX_CONNS_MIN, Integer.toString(DEFAULT_MAX_CONNS_MIN));
_config.setProperty(OPT_MAX_CONNS_HOUR, Integer.toString(DEFAULT_MAX_CONNS_HOUR));
_config.setProperty(OPT_MAX_CONNS_DAY, Integer.toString(DEFAULT_MAX_CONNS_DAY));
_config.setProperty(OPT_MAX_TOTAL_CONNS_MIN, Integer.toString(DEFAULT_MAX_TOTAL_CONNS_MIN));
_config.setProperty(OPT_MAX_STREAMS, Integer.toString(DEFAULT_MAX_STREAMS));
}
if (type.equals(TYPE_HTTP_SERVER) && !p8.equals("true")) {
String p9 = _config.getProperty(OPT_POST_MAX, "0");
String p10 = _config.getProperty(OPT_POST_TOTAL_MAX, "0");
if (p9.equals("0") && p10.equals("0")) {
_config.setProperty(OPT_POST_MAX, Integer.toString(I2PTunnelHTTPServer.DEFAULT_POST_MAX));
_config.setProperty(OPT_POST_TOTAL_MAX, Integer.toString(I2PTunnelHTTPServer.DEFAULT_POST_TOTAL_MAX));
}
}
}
}
// tell i2ptunnel, who will tell the TunnelTask, who will tell the SocketManager

18
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
View File

@ -662,31 +662,31 @@ public class GeneralHelper {
/** all of these are @since 0.8.3 */
public int getLimitMinute(int tunnel) {
return getProperty(tunnel, TunnelConfig.PROP_MAX_CONNS_MIN, 0);
return getProperty(tunnel, TunnelController.PROP_MAX_CONNS_MIN, TunnelController.DEFAULT_MAX_CONNS_MIN);
}
public int getLimitHour(int tunnel) {
return getProperty(tunnel, TunnelConfig.PROP_MAX_CONNS_HOUR, 0);
return getProperty(tunnel, TunnelController.PROP_MAX_CONNS_HOUR, TunnelController.DEFAULT_MAX_CONNS_HOUR);
}
public int getLimitDay(int tunnel) {
return getProperty(tunnel, TunnelConfig.PROP_MAX_CONNS_DAY, 0);
return getProperty(tunnel, TunnelController.PROP_MAX_CONNS_DAY, TunnelController.DEFAULT_MAX_CONNS_DAY);
}
public int getTotalMinute(int tunnel) {
return getProperty(tunnel, TunnelConfig.PROP_MAX_TOTAL_CONNS_MIN, 0);
return getProperty(tunnel, TunnelController.PROP_MAX_TOTAL_CONNS_MIN, TunnelController.DEFAULT_MAX_TOTAL_CONNS_MIN);
}
public int getTotalHour(int tunnel) {
return getProperty(tunnel, TunnelConfig.PROP_MAX_TOTAL_CONNS_HOUR, 0);
return getProperty(tunnel, TunnelController.PROP_MAX_TOTAL_CONNS_HOUR, 0);
}
public int getTotalDay(int tunnel) {
return getProperty(tunnel, TunnelConfig.PROP_MAX_TOTAL_CONNS_DAY, 0);
return getProperty(tunnel, TunnelController.PROP_MAX_TOTAL_CONNS_DAY, 0);
}
public int getMaxStreams(int tunnel) {
return getProperty(tunnel, TunnelConfig.PROP_MAX_STREAMS, 0);
return getProperty(tunnel, TunnelController.PROP_MAX_STREAMS, TunnelController.DEFAULT_MAX_STREAMS);
}
/**
@ -694,11 +694,11 @@ public class GeneralHelper {
* @since 0.9.9
*/
public int getPostMax(int tunnel) {
return getProperty(tunnel, I2PTunnelHTTPServer.OPT_POST_MAX, 0);
return getProperty(tunnel, I2PTunnelHTTPServer.OPT_POST_MAX, I2PTunnelHTTPServer.DEFAULT_POST_MAX);
}
public int getPostTotalMax(int tunnel) {
return getProperty(tunnel, I2PTunnelHTTPServer.OPT_POST_TOTAL_MAX, 0);
return getProperty(tunnel, I2PTunnelHTTPServer.OPT_POST_TOTAL_MAX, I2PTunnelHTTPServer.DEFAULT_POST_TOTAL_MAX);
}
public int getPostCheckTime(int tunnel) {

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

@ -472,13 +472,13 @@ public class TunnelConfig {
/**
* all of these are @since 0.8.3 (moved from IndexBean)
*/
public static final String PROP_MAX_CONNS_MIN = "i2p.streaming.maxConnsPerMinute";
public static final String PROP_MAX_CONNS_HOUR = "i2p.streaming.maxConnsPerHour";
public static final String PROP_MAX_CONNS_DAY = "i2p.streaming.maxConnsPerDay";
public static final String PROP_MAX_TOTAL_CONNS_MIN = "i2p.streaming.maxTotalConnsPerMinute";
public static final String PROP_MAX_TOTAL_CONNS_HOUR = "i2p.streaming.maxTotalConnsPerHour";
public static final String PROP_MAX_TOTAL_CONNS_DAY = "i2p.streaming.maxTotalConnsPerDay";
public static final String PROP_MAX_STREAMS = "i2p.streaming.maxConcurrentStreams";
public static final String PROP_MAX_CONNS_MIN = TunnelController.PROP_MAX_CONNS_MIN;
public static final String PROP_MAX_CONNS_HOUR = TunnelController.PROP_MAX_CONNS_HOUR;
public static final String PROP_MAX_CONNS_DAY = TunnelController.PROP_MAX_CONNS_DAY;
public static final String PROP_MAX_TOTAL_CONNS_MIN = TunnelController.PROP_MAX_TOTAL_CONNS_MIN;
public static final String PROP_MAX_TOTAL_CONNS_HOUR = TunnelController.PROP_MAX_TOTAL_CONNS_HOUR;
public static final String PROP_MAX_TOTAL_CONNS_DAY = TunnelController.PROP_MAX_TOTAL_CONNS_DAY;
public static final String PROP_MAX_STREAMS = TunnelController.PROP_MAX_STREAMS;
public void setLimitMinute(int val) {
_otherOptions.put(PROP_MAX_CONNS_MIN, Integer.toString(val));
@ -607,6 +607,8 @@ public class TunnelConfig {
// generic server stuff
if (_targetPort >= 0)
config.setProperty(TunnelController.PROP_TARGET_PORT, Integer.toString(_targetPort));
// see TunnelController.setConfig()
_booleanOptions.add(TunnelController.PROP_LIMITS_SET);
for (String p : _booleanServerOpts)
config.setProperty(OPT + p, "" + _booleanOptions.contains(p));
for (String p : _otherServerOpts) {
@ -763,7 +765,8 @@ public class TunnelConfig {
I2PTunnelHTTPServer.OPT_REJECT_REFERER,
I2PTunnelHTTPServer.OPT_REJECT_USER_AGENTS,
I2PTunnelServer.PROP_UNIQUE_LOCAL,
"shouldBundleReplyInfo"
"shouldBundleReplyInfo",
TunnelController.PROP_LIMITS_SET
};
private static final String _otherClientOpts[] = {
"i2cp.reduceIdleTime", "i2cp.reduceQuantity", "i2cp.closeIdleTime",