From 77f910ee3611bb3571d9017bd1b4f6b5414e6009 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 15 Dec 2010 13:41:11 +0000
Subject: [PATCH] add max conns to form
---
.../java/src/net/i2p/i2ptunnel/web/EditBean.java | 4 ++++
.../java/src/net/i2p/i2ptunnel/web/IndexBean.java | 11 +++++++++--
apps/i2ptunnel/jsp/editServer.jsp | 10 +++++++++-
3 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
index 994f026dc6..87beb689cb 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
@@ -269,6 +269,10 @@ public class EditBean extends IndexBean {
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) {
TunnelController tun = getController(tunnel);
if (tun != null) {
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
index 39e85d9869..c419f184b0 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
@@ -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_HOUR = "i2p.streaming.maxTotalConnsPerHour";
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) {
if (s != null)
@@ -766,6 +767,11 @@ public class IndexBean {
_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 */
public void setEffort(String val) {
if (val != null) {
@@ -968,9 +974,10 @@ public class IndexBean {
private static final String _otherServerOpts[] = {
"i2cp.reduceIdleTime", "i2cp.reduceQuantity", "i2cp.leaseSetKey", "i2cp.accessList",
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 {
_noShowSet.addAll(Arrays.asList(_noShowOpts));
_noShowSet.addAll(Arrays.asList(_booleanClientOpts));
diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp
index 5ad17a2efe..b0f870fb7a 100644
--- a/apps/i2ptunnel/jsp/editServer.jsp
+++ b/apps/i2ptunnel/jsp/editServer.jsp
@@ -333,7 +333,7 @@
<label for="encrypt" accesskey="e">
<%=intl._("Enable")%>:
</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 id="portField" class="rowItem">
<label for="encrypt" accesskey="e">
@@ -408,6 +408,14 @@
<input type="text" id="port" name="totalDay" value="<%=editBean.getTotalDay(curTunnel)%>" class="freetext" />
</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">
<hr />
--
GitLab