From e4004e6f8374dae81a6c6de9aa95c7969831a8d3 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 26 Nov 2011 22:20:31 +0000
Subject: [PATCH] socket error log fix

---
 .../i2p/i2ptunnel/irc/I2PTunnelDCCServer.java | 23 ++++++++++---------
 history.txt                                   |  3 +++
 .../src/net/i2p/router/RouterVersion.java     |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/I2PTunnelDCCServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/I2PTunnelDCCServer.java
index 0c3ec96ff6..07be3a57b2 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/I2PTunnelDCCServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/I2PTunnelDCCServer.java
@@ -111,18 +111,19 @@ public class I2PTunnelDCCServer extends I2PTunnelServer {
             if (_log.shouldLog(Log.WARN))
                 _log.warn("Incoming DCC connection for I2P port " + myPort +
                           " sending to " + local.ia + ':' + local.port);
-            Socket s = new Socket(local.ia, local.port);
-            _sockList.add(socket);
-            new I2PTunnelRunner(s, socket, slock, null, _sockList);
-            local.socket = socket;
-            local.expire = getTunnel().getContext().clock().now() + OUTBOUND_EXPIRE;
-            _active.put(Integer.valueOf(myPort), local);
-        } catch (SocketException ex) {
             try {
-                socket.close();
-            } catch (IOException ioe) {}
-            if (_log.shouldLog(Log.ERROR))
-                _log.error("Error connecting to server " + remoteHost + ':' + remotePort, ex);
+                Socket s = new Socket(local.ia, local.port);
+                _sockList.add(socket);
+                new I2PTunnelRunner(s, socket, slock, null, _sockList);
+                local.socket = socket;
+                local.expire = getTunnel().getContext().clock().now() + OUTBOUND_EXPIRE;
+                _active.put(Integer.valueOf(myPort), local);
+            } catch (SocketException ex) {
+                try {
+                    socket.close();
+                } catch (IOException ioe) {}
+                _log.error("Error relaying incoming DCC connection to IRC client at " + local.ia + ':' + local.port, ex);
+            }
         } catch (IOException ex) {
             _log.error("Error while waiting for I2PConnections", ex);
         }
diff --git a/history.txt b/history.txt
index e5ffd01be8..9bec510402 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2011-11-26 zzz
+  * DCCServer: Socket error log fix
+
 2011-11-23 zzz
   * CryptixAESEngine: Fix bogus bounds checks
   * NTCP:
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index fecba78d69..a6204817e3 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 = 7;
+    public final static long BUILD = 8;
 
     /** for example "-test" */
     public final static String EXTRA = "";