Changeset f32d3aae

Timestamp:

Jan 6, 2018 4:15:15 PM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

25d16b13

Parents:

b8f17c7

Message:

Console: Show and set burst bandwidth on /config (ticket #2123)
Better error handling
Comment out some unused things, misc. cleanups

Files:

• apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigNetHandler.java (modified) (5 diffs)
• apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigNetHelper.java (modified) (3 diffs)
• apps/routerconsole/jsp/config.jsp (modified) (3 diffs)
• router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java (modified) (2 diffs)

apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigNetHandler.java

@@ -44 +44 @@
     private boolean _laptop;
     private String _inboundRate;
-    private String _inboundBurstRate;
-    private String _inboundBurst;
+    //private String _inboundBurstRate;
+    //private String _inboundBurst;
     private String _outboundRate;
-    private String _outboundBurstRate;
-    private String _outboundBurst;
+    //private String _outboundBurstRate;
+    //private String _outboundBurst;
     private String _sharePct;
     private boolean _ratesOnly;
@@ -115 +115 @@
         _inboundRate = (rate != null ? rate.trim() : null); 
     }
+
+/*
     public void setInboundburstrate(String rate) { 
         _inboundBurstRate = (rate != null ? rate.trim() : null); 
@@ -121 +123 @@
         _inboundBurst = (factor != null ? factor.trim() : null); 
     }
+****/
+
     public void setOutboundrate(String rate) { 
         _outboundRate = (rate != null ? rate.trim() : null); 
     }
+
+/*
     public void setOutboundburstrate(String rate) { 
         _outboundBurstRate = (rate != null ? rate.trim() : null); 
@@ -130 +136 @@
         _outboundBurst = (factor != null ? factor.trim() : null); 
     }
+****/
+
     public void setSharePercentage(String pct) {
         _sharePct = (pct != null ? pct.trim() : null);
@@ -488 +496 @@
         }
 
-        // Since burst is now hidden in the gui, set burst to +10% for 20 seconds
+        // Since burst is now hidden in the gui, set burst to +10% for 20 seconds (prior to 0.9.33)
+        // As of 0.9.33, we set strict bandwidth limits. Specified rate is the burst rate,
+        // and we set the standard rate to 50KB or 10% lower (whichever is less).
         if ( (_inboundRate != null) && (_inboundRate.length() > 0) &&
-            !_inboundRate.equals(_context.getProperty(FIFOBandwidthRefiller.PROP_INBOUND_BANDWIDTH, "" + FIFOBandwidthRefiller.DEFAULT_INBOUND_BANDWIDTH))) {
-            changes.put(FIFOBandwidthRefiller.PROP_INBOUND_BANDWIDTH, _inboundRate);
+            !_inboundRate.equals(_context.getProperty(FIFOBandwidthRefiller.PROP_INBOUND_BURST_BANDWIDTH,
+                                                      Integer.toString(FIFOBandwidthRefiller.DEFAULT_INBOUND_BURST_BANDWIDTH)))) {
             try {
-                int rate = Integer.parseInt(_inboundRate) * (100 + DEF_BURST_PCT) / 100;
+                int rate = Integer.parseInt(_inboundRate);
                 int kb = DEF_BURST_TIME * rate;
-                changes.put(FIFOBandwidthRefiller.PROP_INBOUND_BURST_BANDWIDTH, "" + rate);
-                changes.put(FIFOBandwidthRefiller.PROP_INBOUND_BANDWIDTH_PEAK, "" + kb);
-            } catch (NumberFormatException nfe) {}
-            bwUpdated = true;
+                changes.put(FIFOBandwidthRefiller.PROP_INBOUND_BURST_BANDWIDTH, Integer.toString(rate));
+                changes.put(FIFOBandwidthRefiller.PROP_INBOUND_BANDWIDTH_PEAK, Integer.toString(kb));
+                rate -= Math.min(rate * DEF_BURST_PCT / 100, 50);
+                changes.put(FIFOBandwidthRefiller.PROP_INBOUND_BANDWIDTH, Integer.toString(rate));
+                bwUpdated = true;
+            } catch (NumberFormatException nfe) {
+                addFormError(_t("Invalid bandwidth"));
+            }
         }
         if ( (_outboundRate != null) && (_outboundRate.length() > 0) &&
-            !_outboundRate.equals(_context.getProperty(FIFOBandwidthRefiller.PROP_OUTBOUND_BANDWIDTH, "" + FIFOBandwidthRefiller.DEFAULT_OUTBOUND_BANDWIDTH))) {
-            changes.put(FIFOBandwidthRefiller.PROP_OUTBOUND_BANDWIDTH, _outboundRate);
+            !_outboundRate.equals(_context.getProperty(FIFOBandwidthRefiller.PROP_OUTBOUND_BURST_BANDWIDTH,
+                                                       Integer.toString(FIFOBandwidthRefiller.DEFAULT_OUTBOUND_BURST_BANDWIDTH)))) {
             try {
-                int rate = Integer.parseInt(_outboundRate) * (100 + DEF_BURST_PCT) / 100;
+                int rate = Integer.parseInt(_outboundRate);
                 int kb = DEF_BURST_TIME * rate;
-                changes.put(FIFOBandwidthRefiller.PROP_OUTBOUND_BURST_BANDWIDTH, "" + rate);
-                changes.put(FIFOBandwidthRefiller.PROP_OUTBOUND_BANDWIDTH_PEAK, "" + kb);
-            } catch (NumberFormatException nfe) {}
-            bwUpdated = true;
+                changes.put(FIFOBandwidthRefiller.PROP_OUTBOUND_BURST_BANDWIDTH, Integer.toString(rate));
+                changes.put(FIFOBandwidthRefiller.PROP_OUTBOUND_BANDWIDTH_PEAK, Integer.toString(kb));
+                rate -= Math.min(rate * DEF_BURST_PCT / 100, 50);
+                changes.put(FIFOBandwidthRefiller.PROP_OUTBOUND_BANDWIDTH, Integer.toString(rate));
+                bwUpdated = true;
+            } catch (NumberFormatException nfe) {
+                addFormError(_t("Invalid bandwidth"));
+            }
         }
 

apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigNetHelper.java

@@ -236 +236 @@
 
     public String getInboundRate() {
-        return "" + _context.bandwidthLimiter().getInboundKBytesPerSecond();
-    }
+        return Integer.toString(_context.bandwidthLimiter().getInboundKBytesPerSecond());
+    }
+
     public String getOutboundRate() {
-        return "" + _context.bandwidthLimiter().getOutboundKBytesPerSecond();
-    }
-    public String getInboundRateBits() {
-        return kbytesToBits(_context.bandwidthLimiter().getInboundKBytesPerSecond());
-    }
-    public String getOutboundRateBits() {
-        return kbytesToBits(_context.bandwidthLimiter().getOutboundKBytesPerSecond());
-    }
+        return Integer.toString(_context.bandwidthLimiter().getOutboundKBytesPerSecond());
+    }
+
+    public String getInboundBurstRateBits() {
+        return kbytesToBits(_context.bandwidthLimiter().getInboundBurstKBytesPerSecond());
+    }
+
+    public String getOutboundBurstRateBits() {
+        return kbytesToBits(_context.bandwidthLimiter().getOutboundBurstKBytesPerSecond());
+    }
+
     public String getShareRateBits() {
         return kbytesToBits(getShareBandwidth());
@@ -254 +258 @@
                ' ' + _t("or {0} bytes per month maximum", DataHelper.formatSize(kbytes * (1024L * 60 * 60 * 24 * 31)));
     }
+
     public String getInboundBurstRate() {
-        return "" + _context.bandwidthLimiter().getInboundBurstKBytesPerSecond();
-    }
+        return Integer.toString(_context.bandwidthLimiter().getInboundBurstKBytesPerSecond());
+    }
+
     public String getOutboundBurstRate() {
-        return "" + _context.bandwidthLimiter().getOutboundBurstKBytesPerSecond();
-    }
+        return Integer.toString(_context.bandwidthLimiter().getOutboundBurstKBytesPerSecond());
+    }
+
+/*
     public String getInboundBurstFactorBox() {
         int numSeconds = 1;
@@ -302 +310 @@
     }
     
-    /** removed */
     public String getEnableLoadTesting() {
         return "";
     }
+****/
     
     public String getSharePercentageBox() {

apps/routerconsole/jsp/config.jsp

@@ -31 +31 @@
  <b><%=intl._t("I2P will work best if you configure your rates to match the speed of your internet connection.")%></b>
  </td></tr>
-   <tr><td><input style="text-align: right; width: 5em;" name="inboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="inboundRate" />" >
+<%-- display burst, set standard, handler will fix up --%>
+   <tr><td><input style="text-align: right; width: 5em;" name="inboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="inboundBurstRate" />" >
           <%=intl._t("KBps In")%>
-        </td><td>(<jsp:getProperty name="nethelper" property="inboundRateBits" />)</td>
-<% /********
+        </td><td>(<jsp:getProperty name="nethelper" property="inboundBurstRateBits" />)</td>
+<%--
 <!-- let's keep this simple...
  bursting up to
@@ -40 +41 @@
     <jsp:getProperty name="nethelper" property="inboundBurstFactorBox" /><br>
 -->
-*********/ %>
+--%>
     </tr><tr>
-        <td><input style="text-align: right; width: 5em;" name="outboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="outboundRate" />" >
+<%-- display burst, set standard, handler will fix up --%>
+        <td><input style="text-align: right; width: 5em;" name="outboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="outboundBurstRate" />" >
          <%=intl._t("KBps Out")%>
-        </td><td>(<jsp:getProperty name="nethelper" property="outboundRateBits" />)</td>
-<% /********
+        </td><td>(<jsp:getProperty name="nethelper" property="outboundBurstRateBits" />)</td>
+<%--
 <!-- let's keep this simple...
  bursting up to
@@ -53 +55 @@
     A negative rate sets the default.</i><br>
 -->
-*********/ %>
+--%>
     </tr><tr>
         <td><jsp:getProperty name="nethelper" property="sharePercentageBox" /> <%=intl._t("Share")%></td>

router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java

@@ -234 +234 @@
         if (_inboundBurstKBytesPerSecond <= 0)
             _inboundBurstKBytesPerSecond = DEFAULT_INBOUND_BURST_BANDWIDTH;
+        if (_inboundBurstKBytesPerSecond < _inboundKBytesPerSecond)
+            _inboundBurstKBytesPerSecond = _inboundKBytesPerSecond;
         _limiter.setInboundBurstKBps(_inboundBurstKBytesPerSecond);
     }
@@ -251 +253 @@
         if (_outboundBurstKBytesPerSecond <= 0)
             _outboundBurstKBytesPerSecond = DEFAULT_OUTBOUND_BURST_BANDWIDTH;
+        if (_outboundBurstKBytesPerSecond < _outboundKBytesPerSecond)
+            _outboundBurstKBytesPerSecond = _outboundKBytesPerSecond;
         _limiter.setOutboundBurstKBps(_outboundBurstKBytesPerSecond);
     }