From c58fd8f84ed576094265b20f10a6c3ef701b1d24 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 30 May 2015 15:46:37 +0000 Subject: [PATCH 1/3] i2ptunnel: Fix +/- variance config (ticket #1587) --- .../java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java | 5 +++-- history.txt | 3 +++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java index 755fc2719..17cb4e6ac 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java @@ -47,7 +47,8 @@ public class TunnelConfig { private String _i2cpPort; private int _tunnelDepth = -1; private int _tunnelQuantity = -1; - private int _tunnelVariance = -1; + // -2 or higher is valid + private int _tunnelVariance = -3; private int _tunnelBackupQuantity = -1; private boolean _connectDelay; private String _customOptions; @@ -801,7 +802,7 @@ public class TunnelConfig { config.setProperty("option.inbound.length", Integer.toString(_tunnelDepth)); config.setProperty("option.outbound.length", Integer.toString(_tunnelDepth)); } - if (_tunnelVariance >= 0) { + if (_tunnelVariance >= -2) { config.setProperty("option.inbound.lengthVariance", Integer.toString(_tunnelVariance)); config.setProperty("option.outbound.lengthVariance", Integer.toString(_tunnelVariance)); } diff --git a/history.txt b/history.txt index a8f316f19..878f30950 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2015-05-30 zzz + * i2ptunnel: Fix +/- variance config (ticket #1587) + 2015-05-29 zzz * HTTP client: Fix occasional truncation of compressed responses diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 98bd96d4e..fc03273f8 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -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 = 32; + public final static long BUILD = 33; /** for example "-test" */ public final static String EXTRA = "-rc"; From 4521156ecb39f1e01cd91d6c74db74f3a01951f0 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 31 May 2015 12:43:06 +0000 Subject: [PATCH 2/3] Fortuna: Catch AIOOBE (ticket #1576) --- core/java/src/net/i2p/util/FortunaRandomSource.java | 10 ++++++++-- history.txt | 3 +++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/core/java/src/net/i2p/util/FortunaRandomSource.java b/core/java/src/net/i2p/util/FortunaRandomSource.java index 340b836a4..9688e8764 100644 --- a/core/java/src/net/i2p/util/FortunaRandomSource.java +++ b/core/java/src/net/i2p/util/FortunaRandomSource.java @@ -262,8 +262,14 @@ public class FortunaRandomSource extends RandomSource implements EntropyHarveste /** reseed the fortuna */ @Override public void feedEntropy(String source, byte[] data, int offset, int len) { - synchronized(_fortuna) { - _fortuna.addRandomBytes(data, offset, len); + try { + synchronized(_fortuna) { + _fortuna.addRandomBytes(data, offset, len); + } + } catch (Exception e) { + // AIOOBE seen, root cause unknown, ticket #1576 + Log log = _context.logManager().getLog(FortunaRandomSource.class); + log.warn("feedEntropy()", e); } } diff --git a/history.txt b/history.txt index 878f30950..832911645 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2015-05-31 zzz + * Fortuna: Catch AIOOBE (ticket #1576) + 2015-05-30 zzz * i2ptunnel: Fix +/- variance config (ticket #1587) diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index fc03273f8..b76ab6863 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -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 = 33; + public final static long BUILD = 34; /** for example "-test" */ public final static String EXTRA = "-rc"; From 3c89bd4e193d589927ceaaecee2d10ef53ab5b1c Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 2 Jun 2015 12:00:59 +0000 Subject: [PATCH 3/3] 0.9.20 --- core/java/src/net/i2p/CoreVersion.java | 2 +- history.txt | 2 ++ installer/install.xml | 2 +- router/java/src/net/i2p/router/RouterVersion.java | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index d189588ec..0aa44511d 100644 --- a/core/java/src/net/i2p/CoreVersion.java +++ b/core/java/src/net/i2p/CoreVersion.java @@ -18,7 +18,7 @@ public class CoreVersion { /** deprecated */ public final static String ID = "Monotone"; - public final static String VERSION = "0.9.19"; + public final static String VERSION = "0.9.20"; /** * For Vuze. diff --git a/history.txt b/history.txt index 832911645..b5ffdbc6b 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,5 @@ +* 2015-06-02 0.9.20 released + 2015-05-31 zzz * Fortuna: Catch AIOOBE (ticket #1576) diff --git a/installer/install.xml b/installer/install.xml index cdbf0a510..95ed4b1cd 100644 --- a/installer/install.xml +++ b/installer/install.xml @@ -4,7 +4,7 @@ i2p - 0.9.19 + 0.9.20 diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index b76ab6863..a411b0099 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,10 +18,10 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 34; + public final static long BUILD = 0; /** for example "-test" */ - public final static String EXTRA = "-rc"; + public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public static void main(String args[]) { System.out.println("I2P Router version: " + FULL_VERSION);