From 7a32f8efd6dc2baa40a713b9326b48643dba3e36 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 5 Feb 2010 19:17:46 +0000 Subject: [PATCH 1/4] Try yet again to prevent two NTCP pumpers --- .../router/transport/ntcp/NTCPTransport.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java index 41ad29e23..afee2bac0 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java @@ -421,7 +421,18 @@ public class NTCPTransport extends TransportImpl { private static final int NUM_CONCURRENT_READERS = 3; private static final int NUM_CONCURRENT_WRITERS = 3; + /** + * Called by TransportManager. + * Caller should stop the transport first, then + * verify stopped with isAlive() + * Unfortunately TransportManager doesn't do that, so we + * check here to prevent two pumpers. + * @return appears to be ignored by caller + */ public synchronized RouterAddress startListening() { + // try once again to prevent two pumpers which is fatal + if (_pumper.isAlive()) + return _myAddress != null ? _myAddress.toRouterAddress() : null; if (_log.shouldLog(Log.WARN)) _log.warn("Starting ntcp transport listening"); _finisher.start(); _pumper.startPumping(); @@ -433,7 +444,17 @@ public class NTCPTransport extends TransportImpl { return bindAddress(); } + /** + * Only called by CSFI. + * Caller should stop the transport first, then + * verify stopped with isAlive() + * @return appears to be ignored by caller + */ public synchronized RouterAddress restartListening(RouterAddress addr) { + // try once again to prevent two pumpers which is fatal + // we could just return null since the return value is ignored + if (_pumper.isAlive()) + return _myAddress != null ? _myAddress.toRouterAddress() : null; if (_log.shouldLog(Log.WARN)) _log.warn("Restarting ntcp transport listening"); _finisher.start(); _pumper.startPumping(); @@ -452,6 +473,7 @@ public class NTCPTransport extends TransportImpl { return _pumper.isAlive(); } + /** call from synchronized method */ private RouterAddress bindAddress() { if (_myAddress != null) { try { From 7a7e650ca0e9250b08bc54332f61d7bb69a04ad1 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 5 Feb 2010 19:18:06 +0000 Subject: [PATCH 2/4] news.xml: Wrap i2p version tags in XML comment --- installer/resources/initialNews.xml | 3 ++- installer/resources/news.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/installer/resources/initialNews.xml b/installer/resources/initialNews.xml index 8e33ec57d..18906b2ff 100644 --- a/installer/resources/initialNews.xml +++ b/installer/resources/initialNews.xml @@ -1,5 +1,7 @@ +

  • Congratulations on getting I2P installed!

Welcome to I2P! @@ -47,5 +49,4 @@ Verbinde deinen IRC Klienten mit dem Server auf localhost:6668 und sage H

Не забудьте заглянуть в наш FAQ.

- diff --git a/installer/resources/news.xml b/installer/resources/news.xml index cd8e9ecb8..3c84cacf7 100644 --- a/installer/resources/news.xml +++ b/installer/resources/news.xml @@ -1,5 +1,7 @@ +

0.7.10 closes some recently-discovered vulnerabilities related to the @@ -17,4 +19,3 @@ or donate! We are still looking for help on new and existing translations. Please volunteer on IRC #i2p.

- From 7c236c0fa0704c7e851ba9ef1d409991dacbb140 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 5 Feb 2010 19:18:26 +0000 Subject: [PATCH 3/4] Console: Fix saving update keys, was broken in 0.7.10 --- .../java/src/net/i2p/router/web/ConfigUpdateHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java index 62d60358d..512471a10 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java @@ -124,6 +124,7 @@ public class ConfigUpdateHandler extends FormHandler { } if ( (_trustedKeys != null) && (_trustedKeys.length() > 0) ) { + _trustedKeys = _trustedKeys.replaceAll("\r\n", ",").replaceAll("\n", ","); String oldKeys = new TrustedUpdate(_context).getTrustedKeysString(); if ( (oldKeys == null) || (!_trustedKeys.equals(oldKeys)) ) { _context.router().setConfigSetting(PROP_TRUSTED_KEYS, _trustedKeys); From 7b59ceb4aec12d4a204dd8059909ecc9e9537cf2 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 5 Feb 2010 20:02:23 +0000 Subject: [PATCH 4/4] Add transmission ID --- .../java/src/org/klomp/snark/web/I2PSnarkServlet.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index 2fbf10462..e8dcfd944 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -662,10 +662,10 @@ public class I2PSnarkServlet extends HttpServlet { client = "Azureus"; else if ("CwsL".equals(ch)) client = "I2PSnarkXL"; - else if ("ZV".equals(ch.substring(2,4))) - client = "Robert"; - else if ("VUZP".equals(ch)) + else if ("ZV".equals(ch.substring(2,4)) || "VUZP".equals(ch)) client = "Robert"; + else if (ch.startsWith("LV")) // LVCS 1.0.2?; LVRS 1.0.4 + client = "Transmission"; else client = _("Unknown") + " (" + ch + ')'; out.write(client + "  " + peer.toString().substring(5, 9));