Changeset 100163e


Ignore:
Timestamp:
Feb 21, 2008 2:05:33 PM (13 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
bc7ab391
Parents:
49c02f1
Message:
  • Raise inbound default bandwidth to 32KBps
  • Fix config.jsp that showed 0KBps share bandwidth by default
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java

    r49c02f1 r100163e  
    165165            return rate;
    166166        else
    167             return "16";
     167            return "32";
    168168    }
    169169    public String getOutboundRate() {
     
    179179            return rate;
    180180        else
    181             return "32";
     181            return "48";
    182182    }
    183183    public String getOutboundBurstRate() {
     
    277277
    278278    public int getShareBandwidth() {
    279         String irate = _context.getProperty(PROP_INBOUND_KBPS);
    280         String orate = _context.getProperty(PROP_OUTBOUND_KBPS);
    281         String pctStr = _context.getProperty(PROP_SHARE_PERCENTAGE);
     279        String irate = _context.getProperty(PROP_INBOUND_KBPS, "32");
     280        String orate = _context.getProperty(PROP_OUTBOUND_KBPS, "16");
     281        String pctStr = _context.getProperty(PROP_SHARE_PERCENTAGE, "" + DEFAULT_SHARE_PERCENTAGE);
    282282        if ( (irate != null) && (orate != null) && (pctStr != null)) {
    283283            try {
     
    285285                int orateKBps = Integer.parseInt(orate);
    286286                if (irateKBps < 0 || orateKBps < 0)
    287                     return 0;
     287                    return 12;
    288288                int pct = Integer.parseInt(pctStr);
    289289                return (int) (((float) pct) * Math.min(irateKBps, orateKBps) / 100);
     
    292292            }
    293293        }
    294         return 0;
     294        return 12;
    295295    }
    296296}
  • apps/routerconsole/jsp/config.jsp

    r49c02f1 r100163e  
    4141  <jsp:getProperty name="nethelper" property="outboundBurstFactorBox" /><br />
    4242 <i>KBps = kilobytes per second = 1024 bytes per second.<br />
    43     A negative rate means a default limit of 16KBytes per second.</i><br />
     43    A negative inbound rate means a default limit of 32KBytes per second.
     44    A negative outbound rate means a default limit of 16KBytes per second.</i><br />
    4445 Bandwidth share percentage:
    4546   <jsp:getProperty name="nethelper" property="sharePercentageBox" /><br />
  • history.txt

    r49c02f1 r100163e  
     12008-02-21 zzz
     2    * Raise inbound default bandwidth to 32KBps
     3    * Fix config.jsp that showed 0KBps share bandwidth by default
     4
    152008-02-19 zzz
    26    * Addressbook: Disallow '--' in host names except in IDN,
  • router/java/src/net/i2p/router/RouterVersion.java

    r49c02f1 r100163e  
    1818    public final static String ID = "$Revision: 1.548 $ $Date: 2008-02-10 15:00:00 $";
    1919    public final static String VERSION = "0.6.1.31";
    20     public final static long BUILD = 5;
     20    public final static long BUILD = 6;
    2121    public static void main(String args[]) {
    2222        System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
  • router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java

    r49c02f1 r100163e  
    3232    //public static final String PROP_REPLENISH_FREQUENCY = "i2np.bandwidth.replenishFrequencyMs";
    3333
    34     // no longer allow unlimited bandwidth - the user must specify a value, and if they do not, it is 16KBps
    35     public static final int DEFAULT_INBOUND_BANDWIDTH = 16;
     34    // no longer allow unlimited bandwidth - the user must specify a value, and if they do not, it is 32/16KBps
     35    public static final int DEFAULT_INBOUND_BANDWIDTH = 32;
    3636    public static final int DEFAULT_OUTBOUND_BANDWIDTH = 16;
    37     public static final int DEFAULT_INBOUND_BURST_BANDWIDTH = 16;
    38     public static final int DEFAULT_OUTBOUND_BURST_BANDWIDTH = 16;
     37    public static final int DEFAULT_INBOUND_BURST_BANDWIDTH = 48;
     38    public static final int DEFAULT_OUTBOUND_BURST_BANDWIDTH = 32;
    3939
    4040    public static final int DEFAULT_BURST_SECONDS = 60;
Note: See TracChangeset for help on using the changeset viewer.