From c38d72d17854f2c230581d632ade87d807de537c Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 5 Feb 2011 23:21:56 +0000 Subject: [PATCH] * i2ptunnel: - IRCClient: Use tunnel log instance - Server: Full queue log tweak --- .../net/i2p/i2ptunnel/I2PTunnelIRCClient.java | 16 +++++------ .../net/i2p/i2ptunnel/I2PTunnelServer.java | 7 +++-- .../i2ptunnel/socks/I2PSOCKSIRCTunnel.java | 6 ++-- history.txt | 28 +++++++++++++++++++ .../src/net/i2p/router/RouterVersion.java | 2 +- 5 files changed, 45 insertions(+), 14 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java index d5b3dda65..6bfbdedd1 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java @@ -89,9 +89,9 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable i2ps = createI2PSocket(clientDest); i2ps.setReadTimeout(readTimeout); StringBuffer expectedPong = new StringBuffer(); - Thread in = new I2PAppThread(new IrcInboundFilter(s,i2ps, expectedPong), "IRC Client " + __clientId + " in", true); + Thread in = new I2PAppThread(new IrcInboundFilter(s,i2ps, expectedPong, _log), "IRC Client " + __clientId + " in", true); in.start(); - Thread out = new I2PAppThread(new IrcOutboundFilter(s,i2ps, expectedPong), "IRC Client " + __clientId + " out", true); + Thread out = new I2PAppThread(new IrcOutboundFilter(s,i2ps, expectedPong, _log), "IRC Client " + __clientId + " out", true); out.start(); } catch (Exception ex) { if (_log.shouldLog(Log.ERROR)) @@ -128,13 +128,13 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable private Socket local; private I2PSocket remote; private StringBuffer expectedPong; - // shadows _log in super() - private final Log _log = new Log(I2PTunnelIRCClient.class); + private final Log _log; - public IrcInboundFilter(Socket _local, I2PSocket _remote, StringBuffer pong) { + public IrcInboundFilter(Socket _local, I2PSocket _remote, StringBuffer pong, Log log) { local=_local; remote=_remote; expectedPong=pong; + _log = log; } public void run() { @@ -207,13 +207,13 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable private Socket local; private I2PSocket remote; private StringBuffer expectedPong; - // shadows _log in super() - private final Log _log = new Log(I2PTunnelIRCClient.class); + private final Log _log; - public IrcOutboundFilter(Socket _local, I2PSocket _remote, StringBuffer pong) { + public IrcOutboundFilter(Socket _local, I2PSocket _remote, StringBuffer pong, Log log) { local=_local; remote=_remote; expectedPong=pong; + _log = log; } public void run() { diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java index 5427130bc..31f5f1783 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java @@ -302,9 +302,10 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable { try { i2ps.close(); } catch (IOException ioe) {} - if (open && _log.shouldLog(Log.ERROR)) - _log.error("ServerHandler queue full for " + remoteHost + ':' + remotePort + - "; increase " + PROP_HANDLER_COUNT + '?', ree); + if (open) + _log.logAlways(Log.WARN, "ServerHandler queue full, dropping incoming connection to " + + remoteHost + ':' + remotePort + + "; increase server max threads or " + PROP_HANDLER_COUNT); } } else { // use only for standard servers that can't get slowlorissed! Not for http or irc diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSIRCTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSIRCTunnel.java index 84e66cf72..a19763678 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSIRCTunnel.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSIRCTunnel.java @@ -50,9 +50,11 @@ public class I2PSOCKSIRCTunnel extends I2PSOCKSTunnel { Socket clientSock = serv.getClientSocket(); I2PSocket destSock = serv.getDestinationI2PSocket(this); StringBuffer expectedPong = new StringBuffer(); - Thread in = new I2PAppThread(new I2PTunnelIRCClient.IrcInboundFilter(clientSock, destSock, expectedPong), "SOCKS IRC Client " + (++__clientId) + " in", true); + Thread in = new I2PAppThread(new I2PTunnelIRCClient.IrcInboundFilter(clientSock, destSock, expectedPong, _log), + "SOCKS IRC Client " + (++__clientId) + " in", true); in.start(); - Thread out = new I2PAppThread(new I2PTunnelIRCClient.IrcOutboundFilter(clientSock, destSock, expectedPong), "SOCKS IRC Client " + __clientId + " out", true); + Thread out = new I2PAppThread(new I2PTunnelIRCClient.IrcOutboundFilter(clientSock, destSock, expectedPong, _log), + "SOCKS IRC Client " + __clientId + " out", true); out.start(); } catch (SOCKSException e) { _log.error("Error from SOCKS connection", e); diff --git a/history.txt b/history.txt index 3ab747505..b501b483c 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,31 @@ +2011-02-05 zzz + * .mtn-ignore: New, to make it harder to check in stuff you shouldn't + * BOB: Drop checked-in build dir + * i2psnark: + - Big refactor to support torrents where only the infohash is known + (i.e., added by magnet links) + - Big refactor to use accessors instead of public fields + - Add support for metadata transfer (BEP 9) via the + extension protocol (BEP 10) + - Add support for adding torrents via standard magnet links (BEP 9) + and "maggot" links (http://sponge.i2p/files/maggotspec.txt) + - Add support for peer exchange (i2p_pex) + - Add stubs for future DHT support (BEP 5) + - Add more information on torrent details page; + add details page for single-file torrents + - Make filename filtering consistent (ticket #368) + - Fix add-torrent locking (ticket #371) + - Fix opentracker configuration + - Add several connect-to-self checks + - Add support for using new I2CP bandwidth limiter + - Add support for using new in-session I2CP naming lookups + - Don't expire outbound Piece messages, since we now defer loading the + data from disk + * i2ptunnel: + - Change connect proxy default to outproxy2.h2ik.i2p + - IRCClient: Use tunnel log instance + - Server: Full queue log tweak + 2011-02-03 zzz * Build: - Remove dup flag files (ticket #316) diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 282c18b42..0725033fa 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 = 2; + public final static long BUILD = 3; /** for example "-test" */ public final static String EXTRA = "";