From ac8436a8eb972a853e1a64ae571996f309bc0df7 Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Mon, 20 Feb 2006 18:12:47 +0000
Subject: [PATCH] 2006-02-20  jrandom     * Properly enable TCP this time
 (oops)     * Deal with multiple form handlers on the same page in the console
 without       being too annoying (thanks blubb and bd_!)

---
 .../java/src/net/i2p/router/web/FormHandler.java           | 2 +-
 history.txt                                                | 7 ++++++-
 router/java/src/net/i2p/router/RouterVersion.java          | 4 ++--
 .../networkdb/kademlia/KademliaNetworkDatabaseFacade.java  | 4 ++--
 .../src/net/i2p/router/transport/CommSystemFacadeImpl.java | 2 +-
 .../src/net/i2p/router/transport/TransportManager.java     | 2 +-
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java
index c46260f6b..8f2b39cb2 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java
@@ -114,7 +114,7 @@ public class FormHandler {
             return;
         }
         if (_nonce == null) {
-            addFormError("You trying to mess with me?  Huh?  Are you?");
+            //addFormError("You trying to mess with me?  Huh?  Are you?");
             _valid = false;
             return;
         }
diff --git a/history.txt b/history.txt
index 4124e4196..8b7fd2ec7 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,9 @@
-$Id: history.txt,v 1.409 2006/02/20 09:27:38 jrandom Exp $
+$Id: history.txt,v 1.410 2006/02/20 11:42:36 jrandom Exp $
+
+2006-02-20  jrandom
+    * Properly enable TCP this time (oops)
+    * Deal with multiple form handlers on the same page in the console without
+      being too annoying (thanks blubb and bd_!)
 
 2006-02-20  jrandom
     * Reenable the TCP transport as a fallback (we'll continue to muck with
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 5b65a02d8..30901398f 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.351 $ $Date: 2006/02/20 09:19:58 $";
+    public final static String ID = "$Revision: 1.352 $ $Date: 2006/02/20 11:42:33 $";
     public final static String VERSION = "0.6.1.10";
-    public final static long BUILD = 7;
+    public final static long BUILD = 8;
     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/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
index 1449b65fc..aaca3aff9 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
@@ -454,8 +454,8 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade {
     
     public RouterInfo lookupRouterInfoLocally(Hash key) {
         if (!_initialized) return null;
-        if (_ds.isKnown(key)) {
-            DataStructure ds = _ds.get(key);
+        DataStructure ds = _ds.get(key);
+        if (ds != null) {
             if (ds instanceof RouterInfo)
                 return (RouterInfo)ds;
             else {
diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
index 97143f01f..7e28cbf59 100644
--- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
+++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
@@ -110,7 +110,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
     private final static String PROP_I2NP_TCP_DISABLED = "i2np.tcp.disable";
     
     private RouterAddress createTCPAddress() {
-        if (true) return null;
+        if (!TransportManager.ALLOW_TCP) return null;
         RouterAddress addr = new RouterAddress();
         addr.setCost(10);
         addr.setExpiration(null);
diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java
index 779631753..0a060dac7 100644
--- a/router/java/src/net/i2p/router/transport/TransportManager.java
+++ b/router/java/src/net/i2p/router/transport/TransportManager.java
@@ -56,7 +56,7 @@ public class TransportManager implements TransportEventListener {
         transport.setListener(null);
     }
 
-    private static final boolean ALLOW_TCP = true;
+    static final boolean ALLOW_TCP = true;
     
     private void configTransports() {
         String disableTCP = _context.router().getConfigSetting(PROP_DISABLE_TCP);