Author: toad
Date: 2008-09-03 22:02:57 +0000 (Wed, 03 Sep 2008)
New Revision: 22388
Modified:
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/NodeCryptoConfig.java
Log:
Pass a boolean isOpennet into NodeCryptoConfig. Enable
alwaysAllowLocalAddresses on darknet by default, disable it on opennet by
default.
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2008-09-03 21:57:16 UTC (rev
22387)
+++ trunk/freenet/src/freenet/node/Node.java 2008-09-03 22:02:57 UTC (rev
22388)
@@ -1025,7 +1025,7 @@
// @see #191
if(oldConfig != null &&
"-1".equals(oldConfig.get("node.listenPort")))
throw new
NodeInitException(NodeInitException.EXIT_COULD_NOT_BIND_USM, "Your freenet.ini
file is corrupted! 'listenPort=-1'");
- NodeCryptoConfig darknetConfig = new
NodeCryptoConfig(nodeConfig, sortOrder++, false);
+ NodeCryptoConfig darknetConfig = new
NodeCryptoConfig(nodeConfig, sortOrder++, false, false);
sortOrder += NodeCryptoConfig.OPTION_COUNT;
darknetCrypto = new NodeCrypto(this, false, darknetConfig,
startupTime, enableARKs);
@@ -1283,7 +1283,7 @@
maxOpennetPeers = 20;
}
- opennetCryptoConfig = new NodeCryptoConfig(opennetConfig, 2 /*
0 = enabled */, true);
+ opennetCryptoConfig = new NodeCryptoConfig(opennetConfig, 2 /*
0 = enabled */, true, true);
if(opennetEnabled) {
opennet = new OpennetManager(this, opennetCryptoConfig,
System.currentTimeMillis(), isAllowedToConnectToSeednodes);
Modified: trunk/freenet/src/freenet/node/NodeCryptoConfig.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeCryptoConfig.java 2008-09-03
21:57:16 UTC (rev 22387)
+++ trunk/freenet/src/freenet/node/NodeCryptoConfig.java 2008-09-03
22:02:57 UTC (rev 22388)
@@ -22,6 +22,8 @@
*/
public class NodeCryptoConfig {
+ private final boolean isOpennet;
+
/** Port number. -1 = choose a random available port number at
activation time. */
private int portNumber;
@@ -47,7 +49,8 @@
* aggressive handshakes (every 10-30 seconds). */
private boolean assumeNATed;
- NodeCryptoConfig(SubConfig config, int sortOrder, boolean onePerIP)
throws NodeInitException {
+ NodeCryptoConfig(SubConfig config, int sortOrder, boolean onePerIP,
boolean isOpennet) throws NodeInitException {
+ this.isOpennet = isOpennet;
config.register("listenPort", -1 /* means random */,
sortOrder++, true, true, "Node.port", "Node.portLong", new IntCallback() {
public Integer get() {
@@ -137,7 +140,7 @@
});
oneConnectionPerAddress =
config.getBoolean("oneConnectionPerIP");
- config.register("alwaysAllowLocalAddresses", false,
sortOrder++, true, false, "Node.alwaysAllowLocalAddresses",
"Node.alwaysAllowLocalAddressesLong",
+ config.register("alwaysAllowLocalAddresses", !isOpennet,
sortOrder++, true, false, "Node.alwaysAllowLocalAddresses",
"Node.alwaysAllowLocalAddressesLong",
new BooleanCallback() {
public Boolean get() {
