Changeset 170be8f


Ignore:
Timestamp:
Aug 8, 2013 10:13:38 PM (7 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
06d2db0
Parents:
ca0bb1a
Message:

Extend IB tunnel expiration

applied changes from 2f2fc980d396aa295ce972afc4298e8f2e763fea

through c2bc3b29484ec8a689c72f2ab4e823a2a72f6430

New update hosts, thx Meeh and dg

Files:
4 edited

Legend:

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

    rca0bb1a r170be8f  
    5959    "http://echelon.i2p/i2p/i2pupdate.su2\r\n" +
    6060    "http://inr.i2p/i2p/i2pupdate.su2\r\n" +
     61    "http://meeh.i2p/i2pupdate/i2pupdate.su2\r\n" +
    6162    "http://stats.i2p/i2p/i2pupdate.su2\r\n" +
    6263    "http://www.i2p2.i2p/_static/i2pupdate.su2\r\n" +
     64    "http://update.dg.i2p/files/i2pupdate.su2\r\n" +
    6365    "http://update.killyourtv.i2p/i2pupdate.su2\r\n" +
    6466    "http://update.postman.i2p/i2pupdate.su2" ;
     
    6769    "http://echelon.i2p/i2p/i2pupdate.sud\r\n" +
    6870    "http://inr.i2p/i2p/i2pupdate.sud\r\n" +
     71    "http://meeh.i2p/i2pupdate/i2pupdate.sud\r\n" +
    6972    "http://stats.i2p/i2p/i2pupdate.sud\r\n" +
    7073    "http://www.i2p2.i2p/_static/i2pupdate.sud\r\n" +
     74    "http://update.dg.i2p/files/i2pupdate.sud\r\n" +
    7175    "http://update.killyourtv.i2p/i2pupdate.sud\r\n" +
    7276    "http://update.postman.i2p/i2pupdate.sud" ;
  • installer/resources/hosts.txt

    rca0bb1a r170be8f  
    346346lists.i2p2.i2p=iKMDu6cP~nt4vubwZOuXWDQS4zdhF9x2YjhcilOrRIHR7lkP6ErNgUHZb~ggwnRaPkj81JpmbwDJ1GR~LLS7DcN5ktSZ1WhjVfrm92AQ4-yDX5HEcPpCnTPBp11zsrh2WEDXSjWMqyBPbkYMzrJ33ZGxVMxccXLlV~W9ecPrpl7EmrIF1gPmbinG1oDA0wFLaJyXPZrCRhdX6xMDgvb0slHE0pxAM00TeAQK~aL~LZ5iwfA7WllYd9jaDdQ-kjaa6qEKSSQHf~bNycR~OFsxKurh1CIbrglo8vIHss-tjIfKzG2mgO8w8AE01uhlsRTxjq7TYhxTWKn4kTFyaljJCE-SL1XTYwfyEEZ90bH8Puk1zDnKIARXMPA1YM26StySLLoFyQu2SbNfJcgCqYFcGStvaG54QFCLVnHOxTKi-Z3D-PBMc9aRKSHJilN1kzExGKNZSW09wX7btyEUCHXJjbep6oFauwrtGmP9SjjZf-o3BHzvQlaLSzVFKuPJ-5tQAAAA
    347347outproxy-tor.meeh.i2p=BcY6Gwk8927GdVB4hS5Gbb7CyYGp6o2do0L4pxLttbBh11tDuS~ExJnao99fl2e4lp596Ueje3z-xlEWKdo~6a7iDDE-x7XlkgkXs-~FJntgQV2c028a5W74U8SZZMdwOMcCsJoi3xYFMhcntRFW28nPMGFcZwYgww6AjPK7iREtBuiboB8Rm7ba~dcyA1Fouu03Y8UY0Dyy1ajApJNmJmHY5wDq2GisGB9OA2GHu-rrOp9iSczYaQJ5-BzhhostBRbHpp6Q-JeUlml1dUGZb1p-0teuqY9WvZEMv5Q9S3lxrN7jmXre5QaQOI9sn8tGJqKc8Dun62j7i6gtZA8IWonN9IacCA64x9sf9DmP1~PCKVXxnKygL818OvP-4CwJgQyUgJEiem~RguxWveZcBsTdedt1xk52cCBa1Yw87qOzO9rOHDWEHrp2qf~yZBEoKVnk4ElM8~G809QL0VJG6MKI2e0kmo5HYWIhZP7qK94M66Nn3tK7pEMpbo0SGazgAAAA
     348meeh.i2p=FA~-QarjN29hh0OzqmdwQV8HldxrjoOQUjKr6c4KQ3XZOjwiAbl7KqQgV1zGXMzWRzyZiKpM8fN0McGZnCK1C7yRguxjBcueGtxR8qT60RO7jTWaSvV5d9ocX0KFqd67U3uhHN95UphcWHm4G75l4om3GCQebNg9xJwbvjUQF~k0Trm5wrVl~XbND-~aIvVGRFappGKx4pfKSNxVJIjMACGG1UUszT4RTFDc6wN49Wujt9WRbFfC9UTTUsWO2waYRyZXaeRyfIRAkYq1jIhqL2Nq~2Gs1NaztwKp8olYv7jX5hxw~prFEKTNX93ZLaezU7YsEuEj-ez~gvoumJGMvyTZjSNQMTbTyCsGbqeEENgyhZkYdlQNqt9OAkp1-ZoFq0YhRGF9bt4EygoHL3DdeSCgummytv3w86M0To-g0S39i7twVPtLsxyoS076uiRADbFVgPfYHH6MBfjiBhxtjhL5eOEbcbgrSDBd6waqEuPdIPUndeEa8Qz-Rovept~kAAAA
     349update.dg.i2p=VF24ZkA7BpNnX5pjhhcqdQoopDX5JPLWRPidbAWXut8OMA4BGoCfGZo6hkT-WhHHOGi0OR89XqpZt6Pvf~KY-SahxNg8LD8FsWdLhaq~PXPi2H8ZGfEW7moEFm2sIlGbwQSWkFwQHmqRRvOs-YkuFFPeSRVMGzBkZGhT7~yJ9TjfpESJo~K4UEYZFp6l9BNj-kLeqEzXd4cCR8kYhubqvRGcdStNWyTPgIjZA~TffAQhR6RvLJovQbIaio8TXECFA1WE4rlX7FXlZt2DLGUhmZMEOisTS3-bH5axZID0461X8nEs~z-DuPl6CO7KFnxspWmA1gNk7Hdwcn4Jzy9bRg-2W4B2Dhh-k7wIi1lI-Tebbvpnx~cwoGjalpW95DomqcxQThQ7ffHtCIZw0GwM9ZJD-diB5zR~jDLCEr8VfiNpHuKzFb3z45QowTo4woXBU1wY0FV0cXYXrVjWz10v96bN3~v99Fp8yFJTbCNwsCf9sOl6ymqJj7l4j~xyxAouAAAA
  • router/java/src/net/i2p/router/RouterVersion.java

    rca0bb1a r170be8f  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 0;
     21    public final static long BUILD = 1;
    2222
    2323    /** for example "-test" */
  • router/java/src/net/i2p/router/tunnel/pool/ExpireJob.java

    rca0bb1a r170be8f  
    3030        // Also skew the inbound away from the outbound
    3131        long expire = cfg.getExpiration();
    32         _dropAfter = expire + Router.CLOCK_FUDGE_FACTOR;
    33         if (_pool.getSettings().isInbound())
     32        if (_pool.getSettings().isInbound()) {
     33            // wait extra long for IB so we don't drop msgs that
     34            // got all the way to us.
     35            _dropAfter = expire + (2 * Router.CLOCK_FUDGE_FACTOR);
    3436            expire -= IB_EARLY_EXPIRE + ctx.random().nextLong(IB_EARLY_EXPIRE);
    35         else
     37        } else {
     38            _dropAfter = expire + Router.CLOCK_FUDGE_FACTOR;
    3639            expire -= OB_EARLY_EXPIRE + ctx.random().nextLong(OB_EARLY_EXPIRE);
     40        }
    3741        // See comments in TunnelPool.locked_buildNewLeaseSet
    3842        cfg.setExpiration(expire);
     
    4650    public void runJob() {
    4751        if (!_leaseUpdated) {
     52            // First run
    4853            _pool.removeTunnel(_cfg);
    4954            _leaseUpdated = true;
     
    5358            requeue(timeToDrop);
    5459        } else {
     60            // Second run
    5561            // already removed/refreshed, but now lets make it
    5662            // so we dont even honor the tunnel anymore
Note: See TracChangeset for help on using the changeset viewer.