From e480931e2066de5ef212d57a5892c645b284b7a3 Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Mon, 8 Oct 2007 04:11:36 +0000
Subject: [PATCH] 2007-10-07  jrandom     * back out the NTCP backlog pushback,
 as it could be used to mount an       active anonymity attack.

---
 history.txt                                                 | 6 +++++-
 router/java/src/net/i2p/router/RouterVersion.java           | 4 ++--
 .../i2p/router/message/OutboundClientMessageOneShotJob.java | 3 +--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/history.txt b/history.txt
index 8c450a79c..c533464d5 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,8 @@
-$Id: history.txt,v 1.592 2007-10-07 21:36:17 complication Exp $
+$Id: history.txt,v 1.593 2007-10-07 22:01:47 jrandom Exp $
+
+2007-10-07  jrandom
+    * back out the NTCP backlog pushback, as it could be used to mount an
+      active anonymity attack.
 
 * 2007-10-07  0.6.1.30 released
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 5e31f1f49..249b3b528 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.528 $ $Date: 2007-10-07 21:36:20 $";
+    public final static String ID = "$Revision: 1.529 $ $Date: 2007-10-07 22:01:49 $";
     public final static String VERSION = "0.6.1.30";
-    public final static long BUILD = 0;
+    public final static long BUILD = 1;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);
diff --git a/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java b/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java
index cc73c0c8b..a3252fdaf 100644
--- a/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java
+++ b/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java
@@ -463,8 +463,7 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
             }
             tunnel = (TunnelInfo) _tunnelCache.get(to);
             if (tunnel != null) {
-                if (getContext().tunnelManager().isValidTunnel(_from.calculateHash(), tunnel) &&
-                    (tunnel.getLength() <= 1 || !getContext().commSystem().isBacklogged(tunnel.getPeer(1))))
+                if (getContext().tunnelManager().isValidTunnel(_from.calculateHash(), tunnel))
                     return(tunnel);
                 else
                     _tunnelCache.remove(to);