add max conns to form

This commit is contained in:
zzz
2010-12-15 13:41:11 +00:00
parent d000d2047d
commit 77f910ee36
3 changed files with 22 additions and 3 deletions

View File

@ -269,6 +269,10 @@ public class EditBean extends IndexBean {
return getProperty(tunnel, PROP_MAX_TOTAL_CONNS_DAY, "0"); return getProperty(tunnel, PROP_MAX_TOTAL_CONNS_DAY, "0");
} }
public String getMaxStreams(int tunnel) {
return getProperty(tunnel, PROP_MAX_STREAMS, "0");
}
private int getProperty(int tunnel, String prop, int def) { private int getProperty(int tunnel, String prop, int def) {
TunnelController tun = getController(tunnel); TunnelController tun = getController(tunnel);
if (tun != null) { if (tun != null) {

View File

@ -735,6 +735,7 @@ public class IndexBean {
protected static final String PROP_MAX_TOTAL_CONNS_MIN = "i2p.streaming.maxTotalConnsPerMinute"; protected static final String PROP_MAX_TOTAL_CONNS_MIN = "i2p.streaming.maxTotalConnsPerMinute";
protected static final String PROP_MAX_TOTAL_CONNS_HOUR = "i2p.streaming.maxTotalConnsPerHour"; protected static final String PROP_MAX_TOTAL_CONNS_HOUR = "i2p.streaming.maxTotalConnsPerHour";
protected static final String PROP_MAX_TOTAL_CONNS_DAY = "i2p.streaming.maxTotalConnsPerDay"; protected static final String PROP_MAX_TOTAL_CONNS_DAY = "i2p.streaming.maxTotalConnsPerDay";
protected static final String PROP_MAX_STREAMS = "i2p.streaming.maxConcurrentStreams";
public void setLimitMinute(String s) { public void setLimitMinute(String s) {
if (s != null) if (s != null)
@ -766,6 +767,11 @@ public class IndexBean {
_otherOptions.put(PROP_MAX_TOTAL_CONNS_DAY, s.trim()); _otherOptions.put(PROP_MAX_TOTAL_CONNS_DAY, s.trim());
} }
public void setMaxStreams(String s) {
if (s != null)
_otherOptions.put(PROP_MAX_STREAMS, s.trim());
}
/** params needed for hashcash and dest modification */ /** params needed for hashcash and dest modification */
public void setEffort(String val) { public void setEffort(String val) {
if (val != null) { if (val != null) {
@ -968,9 +974,10 @@ public class IndexBean {
private static final String _otherServerOpts[] = { private static final String _otherServerOpts[] = {
"i2cp.reduceIdleTime", "i2cp.reduceQuantity", "i2cp.leaseSetKey", "i2cp.accessList", "i2cp.reduceIdleTime", "i2cp.reduceQuantity", "i2cp.leaseSetKey", "i2cp.accessList",
PROP_MAX_CONNS_MIN, PROP_MAX_CONNS_HOUR, PROP_MAX_CONNS_DAY, PROP_MAX_CONNS_MIN, PROP_MAX_CONNS_HOUR, PROP_MAX_CONNS_DAY,
PROP_MAX_TOTAL_CONNS_MIN, PROP_MAX_TOTAL_CONNS_HOUR, PROP_MAX_TOTAL_CONNS_DAY PROP_MAX_TOTAL_CONNS_MIN, PROP_MAX_TOTAL_CONNS_HOUR, PROP_MAX_TOTAL_CONNS_DAY,
PROP_MAX_STREAMS
}; };
protected static final Set _noShowSet = new HashSet(); protected static final Set _noShowSet = new HashSet(64);
static { static {
_noShowSet.addAll(Arrays.asList(_noShowOpts)); _noShowSet.addAll(Arrays.asList(_noShowOpts));
_noShowSet.addAll(Arrays.asList(_booleanClientOpts)); _noShowSet.addAll(Arrays.asList(_booleanClientOpts));

View File

@ -333,7 +333,7 @@
<label for="encrypt" accesskey="e"> <label for="encrypt" accesskey="e">
<%=intl._("Enable")%>: <%=intl._("Enable")%>:
</label> </label>
<input value="1" type="checkbox" id="startOnLoad" name="encrypt" title="Encrypt LeaseSet"<%=(editBean.getEncrypt(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" /> <input value="1" type="checkbox" id="startOnLoad" name="encrypt" title="ONLY clients with the encryption key will be able to connect"<%=(editBean.getEncrypt(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
</div> </div>
<div id="portField" class="rowItem"> <div id="portField" class="rowItem">
<label for="encrypt" accesskey="e"> <label for="encrypt" accesskey="e">
@ -408,6 +408,14 @@
<input type="text" id="port" name="totalDay" value="<%=editBean.getTotalDay(curTunnel)%>" class="freetext" /> <input type="text" id="port" name="totalDay" value="<%=editBean.getTotalDay(curTunnel)%>" class="freetext" />
</div> </div>
</div> </div>
<div class="rowItem">
<div id="optionsField" class="rowItem">
<label><%=intl._("Max concurrent connections (0 to disable)")%>:</label>
</div>
<div id="portField" class="rowItem">
<input type="text" id="port" name="maxStreams" value="<%=editBean.getMaxStreams(curTunnel)%>" class="freetext" />
</div>
</div>
<div class="subdivider"> <div class="subdivider">
<hr /> <hr />