From 100163e03b6f9ffc1e9e516adb4cd1045e00e014 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 21 Feb 2008 14:05:33 +0000
Subject: [PATCH]     * Raise inbound default bandwidth to 32KBps     * Fix
 config.jsp that showed 0KBps share bandwidth by default

---
 .../src/net/i2p/router/web/ConfigNetHelper.java    | 14 +++++++-------
 apps/routerconsole/jsp/config.jsp                  |  3 ++-
 history.txt                                        |  4 ++++
 router/java/src/net/i2p/router/RouterVersion.java  |  2 +-
 .../router/transport/FIFOBandwidthRefiller.java    |  8 ++++----
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
index c0c918314a..e8487542bc 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
@@ -164,7 +164,7 @@ public class ConfigNetHelper {
         if (rate != null)
             return rate;
         else
-            return "16";
+            return "32";
     }
     public String getOutboundRate() {
         String rate = _context.getProperty(PROP_OUTBOUND_KBPS);
@@ -178,7 +178,7 @@ public class ConfigNetHelper {
         if (rate != null)
             return rate;
         else
-            return "32";
+            return "48";
     }
     public String getOutboundBurstRate() {
         String rate = _context.getProperty(PROP_OUTBOUND_BURST_KBPS);
@@ -276,21 +276,21 @@ public class ConfigNetHelper {
     }
 
     public int getShareBandwidth() {
-        String irate = _context.getProperty(PROP_INBOUND_KBPS);
-        String orate = _context.getProperty(PROP_OUTBOUND_KBPS);
-        String pctStr = _context.getProperty(PROP_SHARE_PERCENTAGE);
+        String irate = _context.getProperty(PROP_INBOUND_KBPS, "32");
+        String orate = _context.getProperty(PROP_OUTBOUND_KBPS, "16");
+        String pctStr = _context.getProperty(PROP_SHARE_PERCENTAGE, "" + DEFAULT_SHARE_PERCENTAGE);
         if ( (irate != null) && (orate != null) && (pctStr != null)) {
             try {
                 int irateKBps = Integer.parseInt(irate);
                 int orateKBps = Integer.parseInt(orate);
                 if (irateKBps < 0 || orateKBps < 0)
-                    return 0;
+                    return 12;
                 int pct = Integer.parseInt(pctStr);
                 return (int) (((float) pct) * Math.min(irateKBps, orateKBps) / 100);
             } catch (NumberFormatException nfe) {
                 // ignore
             }
         }
-        return 0;
+        return 12;
     }
 }
diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp
index 8ef8c097ab..1c3fc4a361 100644
--- a/apps/routerconsole/jsp/config.jsp
+++ b/apps/routerconsole/jsp/config.jsp
@@ -40,7 +40,8 @@
     <input name="outboundburstrate" type="text" size="2" value="<jsp:getProperty name="nethelper" property="outboundBurstRate" />" /> KBps for
   <jsp:getProperty name="nethelper" property="outboundBurstFactorBox" /><br />
  <i>KBps = kilobytes per second = 1024 bytes per second.<br />
-    A negative rate means a default limit of 16KBytes per second.</i><br />
+    A negative inbound rate means a default limit of 32KBytes per second.
+    A negative outbound rate means a default limit of 16KBytes per second.</i><br />
  Bandwidth share percentage:
    <jsp:getProperty name="nethelper" property="sharePercentageBox" /><br />
  <% int share = nethelper.getShareBandwidth();
diff --git a/history.txt b/history.txt
index b51b74ea94..ae51b4c4a4 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2008-02-21 zzz
+    * Raise inbound default bandwidth to 32KBps
+    * Fix config.jsp that showed 0KBps share bandwidth by default
+
 2008-02-19 zzz
     * Addressbook: Disallow '--' in host names except in IDN,
       add some reserved host names
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 825e0ec0cf..72bd13a502 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -17,7 +17,7 @@ import net.i2p.CoreVersion;
 public class RouterVersion {
     public final static String ID = "$Revision: 1.548 $ $Date: 2008-02-10 15:00:00 $";
     public final static String VERSION = "0.6.1.31";
-    public final static long BUILD = 5;
+    public final static long BUILD = 6;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);
diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java
index 903220bf34..ea6223ce16 100644
--- a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java
+++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java
@@ -31,11 +31,11 @@ class FIFOBandwidthRefiller implements Runnable {
     public static final String PROP_OUTBOUND_BANDWIDTH_PEAK = "i2np.bandwidth.outboundBurstKBytes";
     //public static final String PROP_REPLENISH_FREQUENCY = "i2np.bandwidth.replenishFrequencyMs";
 
-    // no longer allow unlimited bandwidth - the user must specify a value, and if they do not, it is 16KBps
-    public static final int DEFAULT_INBOUND_BANDWIDTH = 16;
+    // no longer allow unlimited bandwidth - the user must specify a value, and if they do not, it is 32/16KBps
+    public static final int DEFAULT_INBOUND_BANDWIDTH = 32;
     public static final int DEFAULT_OUTBOUND_BANDWIDTH = 16;
-    public static final int DEFAULT_INBOUND_BURST_BANDWIDTH = 16;
-    public static final int DEFAULT_OUTBOUND_BURST_BANDWIDTH = 16;
+    public static final int DEFAULT_INBOUND_BURST_BANDWIDTH = 48;
+    public static final int DEFAULT_OUTBOUND_BURST_BANDWIDTH = 32;
 
     public static final int DEFAULT_BURST_SECONDS = 60;