Author: toad
Date: 2007-12-19 15:09:14 +0000 (Wed, 19 Dec 2007)
New Revision: 16713
Modified:
trunk/freenet/src/freenet/node/NodeCrypto.java
Log:
1091 is mandatory, so remove location, and move testnet inside the conditional.
Modified: trunk/freenet/src/freenet/node/NodeCrypto.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeCrypto.java 2007-12-19 15:03:08 UTC
(rev 16712)
+++ trunk/freenet/src/freenet/node/NodeCrypto.java 2007-12-19 15:09:14 UTC
(rev 16713)
@@ -291,14 +291,12 @@
}
} // Don't include IPs for anonymous initiator.
// Negotiation types
- // FIXME remove location as soon as this build is mandatory!
- 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
// FIXME move inside bracket after next mandatory.
- fs.put("testnet", node.testnetEnabled);
if(node.testnetEnabled) {
+ fs.put("testnet", node.testnetEnabled);
fs.put("testnetPort", node.testnetHandler.getPort());
// Useful, saves a lot of complexity
}
if(!isOpennet)
