Author: toad
Date: 2007-11-19 19:38:17 +0000 (Mon, 19 Nov 2007)
New Revision: 15848
Modified:
trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/NodeCrypto.java
trunk/freenet/src/freenet/node/OpennetManager.java
Log:
Fix prev commit w.r.t. opennet being enabled/disabled
Modified: trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java 2007-11-19
19:34:25 UTC (rev 15847)
+++ trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java 2007-11-19
19:38:17 UTC (rev 15848)
@@ -39,7 +39,7 @@
private boolean _isDone;
private boolean _active = true;
- public UdpSocketHandler(int listenPort, InetAddress bindto, Node node)
throws SocketException {
+ public UdpSocketHandler(int listenPort, InetAddress bindto, Node node,
long startupTime) throws SocketException {
super("UdpSocketHandler packet receiver thread on port " +
listenPort);
this.node = node;
_bindTo = bindto;
@@ -63,7 +63,7 @@
dropRandom = new Random();
logMINOR = Logger.shouldLog(Logger.MINOR, this);
tracker = new AddressTracker();
- tracker.startSend(node.startupTime);
+ tracker.startSend(startupTime);
}
/** Must be called, or we will NPE in run() */
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2007-11-19 19:34:25 UTC (rev
15847)
+++ trunk/freenet/src/freenet/node/Node.java 2007-11-19 19:38:17 UTC (rev
15848)
@@ -626,7 +626,7 @@
NodeCryptoConfig darknetConfig = new
NodeCryptoConfig(nodeConfig, sortOrder++, false);
sortOrder += NodeCryptoConfig.OPTION_COUNT;
- darknetCrypto = new NodeCrypto(this, false, darknetConfig);
+ darknetCrypto = new NodeCrypto(this, false, darknetConfig,
startupTime);
// Must be created after darknetCrypto
dnsr = new DNSRequester(this);
@@ -791,7 +791,7 @@
if(val == (opennet != null)) return;
if(val) {
try {
- o = opennet = new
OpennetManager(Node.this, opennetCryptoConfig);
+ o = opennet = new
OpennetManager(Node.this, opennetCryptoConfig, System.currentTimeMillis());
} catch (NodeInitException e) {
opennet = null;
throw new
InvalidConfigValueException(e.getMessage());
@@ -812,7 +812,7 @@
opennetCryptoConfig = new NodeCryptoConfig(opennetConfig, 1 /*
0 = enabled */, true);
if(opennetEnabled) {
- opennet = new OpennetManager(this, opennetCryptoConfig);
+ opennet = new OpennetManager(this, opennetCryptoConfig,
System.currentTimeMillis());
// Will be started later
} else {
opennet = null;
Modified: trunk/freenet/src/freenet/node/NodeCrypto.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeCrypto.java 2007-11-19 19:34:25 UTC
(rev 15847)
+++ trunk/freenet/src/freenet/node/NodeCrypto.java 2007-11-19 19:38:17 UTC
(rev 15848)
@@ -79,7 +79,7 @@
* Get port number from a config, create socket and packet mangler
* @throws NodeInitException
*/
- public NodeCrypto(Node node, boolean isOpennet, NodeCryptoConfig
config) throws NodeInitException {
+ public NodeCrypto(Node node, boolean isOpennet, NodeCryptoConfig
config, long startupTime) throws NodeInitException {
this.node = node;
this.config = config;
@@ -104,7 +104,7 @@
for(int i=0;i<200000;i++) {
int portNo = 1024 + random.nextInt(65535-1024);
try {
- u = new UdpSocketHandler(portNo,
bindto.getAddress(), node);
+ u = new UdpSocketHandler(portNo,
bindto.getAddress(), node, startupTime);
port = u.getPortNumber();
break;
} catch (Exception e) {
@@ -118,7 +118,7 @@
throw new
NodeInitException(NodeInitException.EXIT_NO_AVAILABLE_UDP_PORTS, "Could not
find an available UDP port number for FNP (none specified)");
} else {
try {
- u = new UdpSocketHandler(port,
bindto.getAddress(), node);
+ u = new UdpSocketHandler(port,
bindto.getAddress(), node, startupTime);
} catch (Exception e) {
throw new
NodeInitException(NodeInitException.EXIT_IMPOSSIBLE_USM_PORT, "Could not bind
to port: "+port+" (node already running?)");
}
Modified: trunk/freenet/src/freenet/node/OpennetManager.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetManager.java 2007-11-19 19:34:25 UTC
(rev 15847)
+++ trunk/freenet/src/freenet/node/OpennetManager.java 2007-11-19 19:38:17 UTC
(rev 15848)
@@ -88,11 +88,11 @@
/** Allow for future expansion. However at any given time all noderefs
should be PADDED_NODEREF_SIZE */
static final int MAX_OPENNET_NODEREF_LENGTH = 32768;
- public OpennetManager(Node node, NodeCryptoConfig opennetConfig) throws
NodeInitException {
+ public OpennetManager(Node node, NodeCryptoConfig opennetConfig, long
startupTime) throws NodeInitException {
logMINOR = Logger.shouldLog(Logger.MINOR, this);
this.node = node;
crypto =
- new NodeCrypto(node, true, opennetConfig);
+ new NodeCrypto(node, true, opennetConfig, startupTime);
File nodeFile = new File(node.nodeDir,
"opennet-"+crypto.portNumber);
File backupNodeFile = new
File("opennet-"+crypto.portNumber+".bak");
