From f39e20106725e10c5c357f189b4a8638af041ee2 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 10 Oct 2011 19:22:03 +0000 Subject: [PATCH] * Lower max netdb RI expiration again * Increase default max tunnels * Cleanups after review * Exorcism (ticket #476) --- apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java | 2 +- .../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java | 4 +++- .../java/src/net/i2p/i2ptunnel/irc/IrcOutboundFilter.java | 2 +- .../java/src/net/i2p/client/streaming/I2PSocket.java | 3 +++ apps/routerconsole/locale/messages_it.po | 2 +- .../java/src/net/i2p/client/streaming/I2PSocketFull.java | 3 +++ .../java/src/net/i2p/client/streaming/MessageChannel.java | 5 ++++- history.txt | 6 ++++++ router/java/src/net/i2p/router/RouterThrottleImpl.java | 2 +- router/java/src/net/i2p/router/RouterVersion.java | 4 ++-- router/java/src/net/i2p/router/StatisticsManager.java | 5 ++--- .../networkdb/kademlia/KademliaNetworkDatabaseFacade.java | 2 +- 12 files changed, 28 insertions(+), 12 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index e2697d3a1b..0dd3e0731d 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -1370,7 +1370,7 @@ public class SnarkManager implements Snark.CompleteListener { // , "Galen", "http://5jpwQMI5FT303YwKa5Rd38PYSX04pbIKgTaKQsWbqoWjIfoancFdWCShXHLI5G5ofOb0Xu11vl2VEMyPsg1jUFYSVnu4-VfMe3y4TKTR6DTpetWrnmEK6m2UXh91J5DZJAKlgmO7UdsFlBkQfR2rY853-DfbJtQIFl91tbsmjcA5CGQi4VxMFyIkBzv-pCsuLQiZqOwWasTlnzey8GcDAPG1LDcvfflGV~6F5no9mnuisZPteZKlrv~~TDoXTj74QjByWc4EOYlwqK8sbU9aOvz~s31XzErbPTfwiawiaZ0RUI-IDrKgyvmj0neuFTWgjRGVTH8bz7cBZIc3viy6ioD-eMQOrXaQL0TCWZUelRwHRvgdPiQrxdYQs7ixkajeHzxi-Pq0EMm5Vbh3j3Q9kfUFW3JjFDA-MLB4g6XnjCbM5J1rC0oOBDCIEfhQkszru5cyLjHiZ5yeA0VThgu~c7xKHybv~OMXION7V8pBKOgET7ZgAkw1xgYe3Kkyq5syAAAA.i2p/tr/announce.php=http://galen.i2p/tr/" "Postman", "http://tracker2.postman.i2p/announce.php=http://tracker2.postman.i2p/" ,"Welterde", "http://tracker.welterde.i2p/a=http://tracker.welterde.i2p/stats?mode=top5" - ,"Diftracker", "http://n--XWjHjUPjnMNrSwXA2OYXpMIUL~u4FNXnrt2HtjK3y6j~4SOClyyeKzd0zRPlixxkCe2wfBIYye3bZsaqAD8bd0QMmowxbq91WpjsPfKMiphJbePKXtYAVARiy0cqyvh1d2LyDE-6wkvgaw45hknmS0U-Dg3YTJZbAQRU2SKXgIlAbWCv4R0kDFBLEVpReDiJef3rzAWHiW8yjmJuJilkYjMwlfRjw8xx1nl2s~yhlljk1pl13jGYb0nfawQnuOWeP-ASQWvAAyVgKvZRJE2O43S7iveu9piuv7plXWbt36ef7ndu2GNoNyPOBdpo9KUZ-NOXm4Kgh659YtEibL15dEPAOdxprY0sYUurVw8OIWqrpX7yn08nbi6qHVGqQwTpxH35vkL8qrCbm-ym7oQJQnNmSDrNTyWYRFSq5s5~7DAdFDzqRPW-pX~g0zEivWj5tzkhvG9rVFgFo0bpQX3X0PUAV9Xbyf8u~v8Zbr9K1pCPqBq9XEr4TqaLHw~bfAAAA.i2p/announce.php=http://diftracker.i2p" + ,"Diftracker", "http://n--XWjHjUPjnMNrSwXA2OYXpMIUL~u4FNXnrt2HtjK3y6j~4SOClyyeKzd0zRPlixxkCe2wfBIYye3bZsaqAD8bd0QMmowxbq91WpjsPfKMiphJbePKXtYAVARiy0cqyvh1d2LyDE-6wkvgaw45hknmS0U-Dg3YTJZbAQRU2SKXgIlAbWCv4R0kDFBLEVpReDiJef3rzAWHiW8yjmJuJilkYjMwlfRjw8xx1nl2s~yhlljk1pl13jGYb0nfawQnuOWeP-ASQWvAAyVgKvZRJE2O43S7iveu9piuv7plXWbt36ef7ndu2GNoNyPOBdpo9KUZ-NOXm4Kgh659YtEibL15dEPAOdxprY0sYUurVw8OIWqrpX7yn08nbi6qHVGqQwTpxH35vkL8qrCbm-ym7oQJQnNmSDrNTyWYRFSq5s5~7DAdFDzqRPW-pX~g0zEivWj5tzkhvG9rVFgFo0bpQX3X0PUAV9Xbyf8u~v8Zbr9K1pCPqBq9XEr4TqaLHw~bfAAAA.i2p/announce.php=http://diftracker.i2p/" // , "CRSTRACK", "http://b4G9sCdtfvccMAXh~SaZrPqVQNyGQbhbYMbw6supq2XGzbjU4NcOmjFI0vxQ8w1L05twmkOvg5QERcX6Mi8NQrWnR0stLExu2LucUXg1aYjnggxIR8TIOGygZVIMV3STKH4UQXD--wz0BUrqaLxPhrm2Eh9Hwc8TdB6Na4ShQUq5Xm8D4elzNUVdpM~RtChEyJWuQvoGAHY3ppX-EJJLkiSr1t77neS4Lc-KofMVmgI9a2tSSpNAagBiNI6Ak9L1T0F9uxeDfEG9bBSQPNMOSUbAoEcNxtt7xOW~cNOAyMyGydwPMnrQ5kIYPY8Pd3XudEko970vE0D6gO19yoBMJpKx6Dh50DGgybLQ9CpRaynh2zPULTHxm8rneOGRcQo8D3mE7FQ92m54~SvfjXjD2TwAVGI~ae~n9HDxt8uxOecAAvjjJ3TD4XM63Q9TmB38RmGNzNLDBQMEmJFpqQU8YeuhnS54IVdUoVQFqui5SfDeLXlSkh4vYoMU66pvBfWbAAAA.i2p/tracker/announce.php=http://crstrack.i2p/tracker/" // ,"Exotrack", "http://blbgywsjubw3d2zih2giokakhe3o2cko7jtte4risb3hohbcoyva.b32.i2p/announce.php=http://exotrack.i2p/" }; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java index f45327e93c..c486cb3776 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java @@ -391,7 +391,9 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn // pos is the start of the path pos = request.indexOf("/"); if (pos == -1) { - pos = request.length(); + //pos = request.length(); + method = null; + break; } host = request.substring(0, pos); diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcOutboundFilter.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcOutboundFilter.java index ce68835c2e..5e8c57d997 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcOutboundFilter.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcOutboundFilter.java @@ -10,7 +10,7 @@ import net.i2p.client.streaming.I2PSocket; import net.i2p.util.Log; /** - * Thread to do inbound filtering. + * Thread to do outbound filtering. * Moved from I2PTunnelIRCClient.java * * @since 0.8.9 diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocket.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocket.java index 4c135ee662..0d2b5d0f04 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocket.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocket.java @@ -35,6 +35,9 @@ public interface I2PSocket { */ public OutputStream getOutputStream() throws IOException; + /** + * @since 0.8.9 + */ public SelectableChannel getChannel() throws IOException; /** diff --git a/apps/routerconsole/locale/messages_it.po b/apps/routerconsole/locale/messages_it.po index 7804287747..080834c574 100644 --- a/apps/routerconsole/locale/messages_it.po +++ b/apps/routerconsole/locale/messages_it.po @@ -3565,7 +3565,7 @@ msgstr "Aiuto & Router I2P; FAQ" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:43 msgid "Help & FAQ" -msgstr "Aiuto &amo; FAQ" +msgstr "Aiuto & FAQ" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:55 msgid "" diff --git a/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketFull.java b/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketFull.java index 59e31b662b..7410028075 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketFull.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketFull.java @@ -68,6 +68,9 @@ class I2PSocketFull implements I2PSocket { return null; } + /** + * @since 0.8.9 + */ public SelectableChannel getChannel() { return new MessageChannel(this); } diff --git a/apps/streaming/java/src/net/i2p/client/streaming/MessageChannel.java b/apps/streaming/java/src/net/i2p/client/streaming/MessageChannel.java index a00384a6d7..05ba76bb75 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/MessageChannel.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/MessageChannel.java @@ -14,6 +14,9 @@ import java.nio.channels.spi.SelectorProvider; import java.util.logging.Level; import java.util.logging.Logger; +/** + * @since 0.8.9 + */ public class MessageChannel extends SelectableChannel implements ReadableByteChannel, WritableByteChannel { final MessageInputStream in; @@ -181,4 +184,4 @@ public class MessageChannel extends SelectableChannel implements ReadableByteCha } } } -} \ No newline at end of file +} diff --git a/history.txt b/history.txt index 6d9d15f3c8..9e6694808c 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,9 @@ +2011-10-10 zzz + * Lower max netdb RI expiration again + * Increase default max tunnels + * Cleanups after review + * Exorcism (ticket #476) + 2011-10-07 kytv * GeoIP: - Switch to Maxmind's GeoIP service (it's better maintained diff --git a/router/java/src/net/i2p/router/RouterThrottleImpl.java b/router/java/src/net/i2p/router/RouterThrottleImpl.java index 28eb97137b..2103e945c3 100644 --- a/router/java/src/net/i2p/router/RouterThrottleImpl.java +++ b/router/java/src/net/i2p/router/RouterThrottleImpl.java @@ -31,7 +31,7 @@ class RouterThrottleImpl implements RouterThrottle { private static int THROTTLE_EVENT_LIMIT = 30; private static final String PROP_MAX_TUNNELS = "router.maxParticipatingTunnels"; - private static final int DEFAULT_MAX_TUNNELS = 2500; + private static final int DEFAULT_MAX_TUNNELS = 3500; private static final String PROP_DEFAULT_KBPS_THROTTLE = "router.defaultKBpsThrottle"; private static final String PROP_MAX_PROCESSINGTIME = "router.defaultProcessingTimeThrottle"; diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 5fd579e05b..a411b00998 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 = 30; + 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); diff --git a/router/java/src/net/i2p/router/StatisticsManager.java b/router/java/src/net/i2p/router/StatisticsManager.java index 86cbef8fe8..63ac29cfb2 100644 --- a/router/java/src/net/i2p/router/StatisticsManager.java +++ b/router/java/src/net/i2p/router/StatisticsManager.java @@ -206,10 +206,9 @@ public class StatisticsManager implements Service { } long numPeriods = rate.getLifetimePeriods(); if (fudgeQuantity) { - buf.append("666").append(';'); + buf.append("555;"); if (numPeriods > 0) { - buf.append("666").append(';'); - buf.append("666").append(';'); + buf.append("555;555;"); } } else { buf.append(num(rate.getLastEventCount())).append(';'); diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java index 85815e11d7..a46ad3d334 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java @@ -121,7 +121,7 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade { * limits for accepting a dbDtore of a router (unless we dont * know anyone or just started up) -- see validate() below */ - private final static long ROUTER_INFO_EXPIRATION = 2*24*60*60*1000l; + private final static long ROUTER_INFO_EXPIRATION = 36*60*60*1000l; private final static long ROUTER_INFO_EXPIRATION_MIN = 90*60*1000l; private final static long ROUTER_INFO_EXPIRATION_SHORT = 75*60*1000l; private final static long ROUTER_INFO_EXPIRATION_FLOODFILL = 60*60*1000l;