Author: toad
Date: 2008-02-29 17:34:19 +0000 (Fri, 29 Feb 2008)
New Revision: 18252

Modified:
   trunk/freenet/src/freenet/node/NodeCrypto.java
Log:
Shrink noderef slightly:
Don't put location, whether we are anonInit or not.
Don't put testnet if false, whether we are anonInit or not.

Modified: trunk/freenet/src/freenet/node/NodeCrypto.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeCrypto.java      2008-02-29 17:24:37 UTC 
(rev 18251)
+++ trunk/freenet/src/freenet/node/NodeCrypto.java      2008-02-29 17:34:19 UTC 
(rev 18252)
@@ -292,19 +292,12 @@
                        }
                } // Don't include IPs for anonymous initiator.
                // Negotiation types
-               // FIXME remove this when everyone has upgraded... it breaks 
UOM so allow a reasonable amount of time, maybe 19 feb 2008.
-               if(!forAnonInitiator)
-                       fs.put("location", node.lm.getLocation());
                fs.putSingle("version", Version.getVersionString()); // Keep, 
vital that peer know our version. For example, some types may be sent in 
different formats to different node versions (e.g. Peer).
                if(!forAnonInitiator)
                        fs.putSingle("lastGoodVersion", 
Version.getLastGoodVersionString()); // Also vital
                if(node.testnetEnabled) {
                        fs.put("testnet", true);
                        fs.put("testnetPort", node.testnetHandler.getPort()); 
// Useful, saves a lot of complexity
-               } else {
-                       // FIXME remove this when everyone has upgraded... it 
breaks UOM so allow a reasonable amount of time, maybe 19 feb 2008.
-                       if(!forAnonInitiator)
-                               fs.put("testnet", false);
                }
                if(!isOpennet)
                        fs.putSingle("myName", node.getMyName()); // FIXME see 
#942


Reply via email to