echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extend IB tunnel expiration

Browse Source 
applied changes from 2f2fc980d396aa295ce972afc4298e8f2e763fea
             through c2bc3b29484ec8a689c72f2ab4e823a2a72f6430

New update hosts, thx Meeh and dg
This commit is contained in:
zzz
2013-08-08 22:13:38 +00:00
parent ca0bb1ab76
commit 170be8f033
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java
View File

@ -58,16 +58,20 @@ public class ConfigUpdateHandler extends FormHandler {
private static final String PACK200_URLS =
"http://echelon.i2p/i2p/i2pupdate.su2\r\n" +
"http://inr.i2p/i2p/i2pupdate.su2\r\n" +
"http://meeh.i2p/i2pupdate/i2pupdate.su2\r\n" +
"http://stats.i2p/i2p/i2pupdate.su2\r\n" +
"http://www.i2p2.i2p/_static/i2pupdate.su2\r\n" +
"http://update.dg.i2p/files/i2pupdate.su2\r\n" +
"http://update.killyourtv.i2p/i2pupdate.su2\r\n" +
"http://update.postman.i2p/i2pupdate.su2" ;
private static final String NO_PACK200_URLS =
"http://echelon.i2p/i2p/i2pupdate.sud\r\n" +
"http://inr.i2p/i2p/i2pupdate.sud\r\n" +
"http://meeh.i2p/i2pupdate/i2pupdate.sud\r\n" +
"http://stats.i2p/i2p/i2pupdate.sud\r\n" +
"http://www.i2p2.i2p/_static/i2pupdate.sud\r\n" +
"http://update.dg.i2p/files/i2pupdate.sud\r\n" +
"http://update.killyourtv.i2p/i2pupdate.sud\r\n" +
"http://update.postman.i2p/i2pupdate.sud" ;

2
installer/resources/hosts.txt
View File

@ -345,3 +345,5 @@ www.syndie.i2p=DvyDrcY8se2M~qqp4qfZn-6UTFfS2Ieaye5QIhKoFQGktMbCK2MzhAMYvNm7n1k9O
syndie-project.i2p=2~qacMy9FwwWCFm3JYRKSLIe8u6wEuinZPre0WoZC-M3IUSg8VhUp1QSPuaeFJdym69hjew6AOE-wnZ30mtzriXyvaYh7UNshTc9ZdEBWwhdn5cghMjf48HdBw3pKAiiw1gwv8WwsskbAxbSTkcQUmqGsterPyUqspSqddwUkcDxZHC7dUJsyyd4gcul40KljlIu9mMWXZLWQ7Zu8od~NcFNHVBE-UnTvDmHErpx7AWcN9VrD4j-OuVqsLYq1T9uhdLH-~H~9eE5RKekz6ehhGJRLlGB~2~MYVt4xrqbo4z18nFxdp9PorOO1wt5xiFSw4GEX5HAO2~pt97DVkcwogOEVCJbRbLiIJJDmehn5PB-56K4tjuUNFtzLAq7QQZEAAHGCUEaVPUObKS20vU~JN6GrAOAXKM2M-16frR0ddpJ4f55iuc~tVL3OFPAtha5aHP9xihP7i80rB5LsG0aT77Ey~mCWHrV2sQwhua40vP9TgpCi6Lg21DnVrR97S5tAAAA
lists.i2p2.i2p=iKMDu6cP~nt4vubwZOuXWDQS4zdhF9x2YjhcilOrRIHR7lkP6ErNgUHZb~ggwnRaPkj81JpmbwDJ1GR~LLS7DcN5ktSZ1WhjVfrm92AQ4-yDX5HEcPpCnTPBp11zsrh2WEDXSjWMqyBPbkYMzrJ33ZGxVMxccXLlV~W9ecPrpl7EmrIF1gPmbinG1oDA0wFLaJyXPZrCRhdX6xMDgvb0slHE0pxAM00TeAQK~aL~LZ5iwfA7WllYd9jaDdQ-kjaa6qEKSSQHf~bNycR~OFsxKurh1CIbrglo8vIHss-tjIfKzG2mgO8w8AE01uhlsRTxjq7TYhxTWKn4kTFyaljJCE-SL1XTYwfyEEZ90bH8Puk1zDnKIARXMPA1YM26StySLLoFyQu2SbNfJcgCqYFcGStvaG54QFCLVnHOxTKi-Z3D-PBMc9aRKSHJilN1kzExGKNZSW09wX7btyEUCHXJjbep6oFauwrtGmP9SjjZf-o3BHzvQlaLSzVFKuPJ-5tQAAAA
outproxy-tor.meeh.i2p=BcY6Gwk8927GdVB4hS5Gbb7CyYGp6o2do0L4pxLttbBh11tDuS~ExJnao99fl2e4lp596Ueje3z-xlEWKdo~6a7iDDE-x7XlkgkXs-~FJntgQV2c028a5W74U8SZZMdwOMcCsJoi3xYFMhcntRFW28nPMGFcZwYgww6AjPK7iREtBuiboB8Rm7ba~dcyA1Fouu03Y8UY0Dyy1ajApJNmJmHY5wDq2GisGB9OA2GHu-rrOp9iSczYaQJ5-BzhhostBRbHpp6Q-JeUlml1dUGZb1p-0teuqY9WvZEMv5Q9S3lxrN7jmXre5QaQOI9sn8tGJqKc8Dun62j7i6gtZA8IWonN9IacCA64x9sf9DmP1~PCKVXxnKygL818OvP-4CwJgQyUgJEiem~RguxWveZcBsTdedt1xk52cCBa1Yw87qOzO9rOHDWEHrp2qf~yZBEoKVnk4ElM8~G809QL0VJG6MKI2e0kmo5HYWIhZP7qK94M66Nn3tK7pEMpbo0SGazgAAAA
meeh.i2p=FA~-QarjN29hh0OzqmdwQV8HldxrjoOQUjKr6c4KQ3XZOjwiAbl7KqQgV1zGXMzWRzyZiKpM8fN0McGZnCK1C7yRguxjBcueGtxR8qT60RO7jTWaSvV5d9ocX0KFqd67U3uhHN95UphcWHm4G75l4om3GCQebNg9xJwbvjUQF~k0Trm5wrVl~XbND-~aIvVGRFappGKx4pfKSNxVJIjMACGG1UUszT4RTFDc6wN49Wujt9WRbFfC9UTTUsWO2waYRyZXaeRyfIRAkYq1jIhqL2Nq~2Gs1NaztwKp8olYv7jX5hxw~prFEKTNX93ZLaezU7YsEuEj-ez~gvoumJGMvyTZjSNQMTbTyCsGbqeEENgyhZkYdlQNqt9OAkp1-ZoFq0YhRGF9bt4EygoHL3DdeSCgummytv3w86M0To-g0S39i7twVPtLsxyoS076uiRADbFVgPfYHH6MBfjiBhxtjhL5eOEbcbgrSDBd6waqEuPdIPUndeEa8Qz-Rovept~kAAAA
update.dg.i2p=VF24ZkA7BpNnX5pjhhcqdQoopDX5JPLWRPidbAWXut8OMA4BGoCfGZo6hkT-WhHHOGi0OR89XqpZt6Pvf~KY-SahxNg8LD8FsWdLhaq~PXPi2H8ZGfEW7moEFm2sIlGbwQSWkFwQHmqRRvOs-YkuFFPeSRVMGzBkZGhT7~yJ9TjfpESJo~K4UEYZFp6l9BNj-kLeqEzXd4cCR8kYhubqvRGcdStNWyTPgIjZA~TffAQhR6RvLJovQbIaio8TXECFA1WE4rlX7FXlZt2DLGUhmZMEOisTS3-bH5axZID0461X8nEs~z-DuPl6CO7KFnxspWmA1gNk7Hdwcn4Jzy9bRg-2W4B2Dhh-k7wIi1lI-Tebbvpnx~cwoGjalpW95DomqcxQThQ7ffHtCIZw0GwM9ZJD-diB5zR~jDLCEr8VfiNpHuKzFb3z45QowTo4woXBU1wY0FV0cXYXrVjWz10v96bN3~v99Fp8yFJTbCNwsCf9sOl6ymqJj7l4j~xyxAouAAAA

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 0;
public final static long BUILD = 1;
/** for example "-test" */
public final static String EXTRA = "-rc0971";

12
router/java/src/net/i2p/router/tunnel/pool/ExpireJob.java
View File

@ -29,11 +29,15 @@ class ExpireJob extends JobImpl {
// others may be sending to the published lease expirations
// Also skew the inbound away from the outbound
long expire = cfg.getExpiration();
_dropAfter = expire + Router.CLOCK_FUDGE_FACTOR;
if (_pool.getSettings().isInbound())
if (_pool.getSettings().isInbound()) {
// wait extra long for IB so we don't drop msgs that
// got all the way to us.
_dropAfter = expire + (2 * Router.CLOCK_FUDGE_FACTOR);
expire -= IB_EARLY_EXPIRE + ctx.random().nextLong(IB_EARLY_EXPIRE);
else
} else {
_dropAfter = expire + Router.CLOCK_FUDGE_FACTOR;
expire -= OB_EARLY_EXPIRE + ctx.random().nextLong(OB_EARLY_EXPIRE);
}
// See comments in TunnelPool.locked_buildNewLeaseSet
cfg.setExpiration(expire);
getTiming().setStartAfter(expire);
@ -45,6 +49,7 @@ class ExpireJob extends JobImpl {
public void runJob() {
if (!_leaseUpdated) {
// First run
_pool.removeTunnel(_cfg);
_leaseUpdated = true;
// noop for outbound
@ -52,6 +57,7 @@ class ExpireJob extends JobImpl {
long timeToDrop = _dropAfter - getContext().clock().now();
requeue(timeToDrop);
} else {
// Second run
// already removed/refreshed, but now lets make it
// so we dont even honor the tunnel anymore
getContext().tunnelDispatcher().remove(_cfg);