Changeset 39ba081


Ignore:
Timestamp:
Oct 7, 2011 3:44:06 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
921591e
Parents:
c270e14
Message:
  • Reseed:
    • Restore ovh reseeds, thx mathiasdm
  • Tunnels:
    • For expl. tunnels, fall back to high cap sooner
    • Tweak build rejections for class N
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • history.txt

    rc270e14 r39ba081  
    1212
    13132011-10-07 zzz
    14   * Add https reseed thx h2ik
     14  * Reseed:
     15    - Add an https reseed, thx h2ik
     16    - Restore ovh reseeds, thx mathiasdm
     17  * Tunnels:
     18    - For expl. tunnels, fall back to high cap sooner
     19    - Tweak build rejections for class N
    1520
    16212011-10-06 kytv
  • router/java/src/net/i2p/router/RouterVersion.java

    rc270e14 r39ba081  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 28;
     21    public final static long BUILD = 29;
    2222
    2323    /** for example "-test" */
  • router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java

    rc270e14 r39ba081  
    6161              "http://forum.i2p2.de/netdb/" + "," +
    6262         /*   "http://www.i2pbote.net/netDb/," +   NO DATA */
    63          /*   "http://r31453.ovh.net/static_media/files/netDb/," +   DOWN */
     63              "http://r31453.ovh.net/static_media/files/netDb/" + "," +
    6464              "http://cowpuncher.drollette.com/netdb/" + "," +
    6565              "http://75.145.125.59/netDb/";
     
    7171         /*   "https://www.i2pbote.net/netDb/," +   NO DATA */
    7272              "https://reseed.i2p-projekt.de/" + "," +
    73          /*   "https://r31453.ovh.net/static_media/files/netDb/," + DOWN */
    74               "https://cowpuncher.drollette.com/netdb/" + ";" +
     73              "https://r31453.ovh.net/static_media/files/netDb/" + "," +
     74              "https://cowpuncher.drollette.com/netdb/" + "," +
    7575              "https://75.145.125.59/netDb/";
    7676
  • router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java

    rc270e14 r39ba081  
    493493         * reject this request.
    494494         *
    495          * Don't do this for class O, under the assumption that they are already talking
     495         * Don't do this for class N or O, under the assumption that they are already talking
    496496         * to most of the routers, so there's no reason to reject. This may drive them
    497497         * to their conn. limits, but it's hopefully a temporary solution to the
     
    499499         */
    500500        RouterInfo ri = _context.router().getRouterInfo();
    501         if (response == 0 &&
    502             (ri == null || ri.getBandwidthTier().charAt(0) != 'O') &&
    503             ((isInGW && ! _context.commSystem().haveInboundCapacity(87)) ||
    504              (isOutEnd && ! _context.commSystem().haveOutboundCapacity(87)))) {
    505                 _context.throttle().setTunnelStatus(_x("Rejecting tunnels: Connection limit"));
     501        if (response == 0) {
     502            if (ri == null) {
     503                // ?? We should always have a RI
    506504                response = TunnelHistory.TUNNEL_REJECT_BANDWIDTH;
     505            } else {
     506                char bw = ri.getBandwidthTier().charAt(0);
     507                if (bw != 'O' && bw != 'N' &&
     508                    ((isInGW && ! _context.commSystem().haveInboundCapacity(87)) ||
     509                     (isOutEnd && ! _context.commSystem().haveOutboundCapacity(87)))) {
     510                        _context.throttle().setTunnelStatus(_x("Rejecting tunnels: Connection limit"));
     511                        response = TunnelHistory.TUNNEL_REJECT_BANDWIDTH;
     512                }
     513            }
    507514        }
    508515       
  • router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java

    rc270e14 r39ba081  
    6868    }
    6969   
    70     private static final int MIN_NONFAILING_PCT = 25;
     70    private static final int MIN_NONFAILING_PCT = 15;
    7171    private static final int MIN_ACTIVE_PEERS_STARTUP = 6;
    7272    private static final int MIN_ACTIVE_PEERS = 12;
     
    142142        if (e <= c || e <= 25) // doing very well (unlikely)
    143143            return 0;
    144         if (c >= 90) // doing very badly
     144        // Doing very badly? This is important to prevent network congestion collapse
     145        if (c >= 70 || e >= 75)
    145146            return 100 - MIN_NONFAILING_PCT;
    146147        return (100 * (e-c)) / (100-c);
Note: See TracChangeset for help on using the changeset viewer.