Changeset a6a6142


Ignore:
Timestamp:
Jul 13, 2009 3:06:06 AM (11 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
6226b8a
Parents:
35b5bf18 (diff), 5c20574 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '1d3fdcc1394982ef7bc5c12b7aa163919c533096'

and '7069e4dcedf5578597d00177dd220e02ded3634e'

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r35b5bf18 ra6a6142  
    342342            <fileset  dir="installer/resources/themes/console/light/" />
    343343        </copy>
     344        <copy todir="pkg-temp/docs/" >
     345          <fileset dir="." includes="readme*.html" />
     346        </copy>
    344347    </target>
    345348
  • router/java/src/net/i2p/router/RouterThrottleImpl.java

    r35b5bf18 ra6a6142  
    3232   
    3333    private static final String PROP_MAX_TUNNELS = "router.maxParticipatingTunnels";
    34     private static final int DEFAULT_MAX_TUNNELS = 2000;
     34    private static final int DEFAULT_MAX_TUNNELS = 3000;
    3535    private static final String PROP_DEFAULT_KBPS_THROTTLE = "router.defaultKBpsThrottle";
    3636    private static final String PROP_MAX_PROCESSINGTIME = "router.defaultProcessingTimeThrottle";
  • router/java/src/net/i2p/router/TunnelPoolSettings.java

    r35b5bf18 ra6a6142  
    5050    public static final int     DEFAULT_DURATION = 10*60*1000;
    5151    public static final int     DEFAULT_LENGTH = 2;
    52     public static final int     DEFAULT_LENGTH_VARIANCE = 1;
     52    public static final int     DEFAULT_LENGTH_VARIANCE = 0;
    5353    public static final boolean DEFAULT_ALLOW_ZERO_HOP = true;
    5454    public static final int     DEFAULT_IP_RESTRICTION = 2;    // class B (/16)
  • router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java

    r35b5bf18 ra6a6142  
    509509         * approaching our connection limit (i.e. !haveCapacity()),
    510510         * reject this request.
     511         *
     512         * Don't do this for class O, under the assumption that they are already talking
     513         * to most of the routers, so there's no reason to reject. This may drive them
     514         * to their conn. limits, but it's hopefully a temporary solution to the
     515         * tunnel build congestion. As the net grows this will have to be revisited.
    511516         */
     517        RouterInfo ri = _context.router().getRouterInfo();
    512518        if (response == 0 &&
     519            (ri == null || ri.getBandwidthTier().charAt(0) != 'O') &&
    513520            ((isInGW && ! _context.commSystem().haveInboundCapacity(87)) ||
    514521             (isOutEnd && ! _context.commSystem().haveOutboundCapacity(87)))) {
Note: See TracChangeset for help on using the changeset viewer.