[freenet-cvs] r16240 - trunk/freenet/src/freenet/node

[toad at freenetproject.org]

Author: toad
Date: 2007-12-03 21:15:32 +0000 (Mon, 03 Dec 2007)
New Revision: 16240

Modified:
   trunk/freenet/src/freenet/node/OpennetPeerNode.java
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Move timeLastConnected etc into PeerNode

Modified: trunk/freenet/src/freenet/node/OpennetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetPeerNode.java	2007-12-03 21:11:05 UTC (rev 16239)
+++ trunk/freenet/src/freenet/node/OpennetPeerNode.java	2007-12-03 21:15:32 UTC (rev 16240)
@@ -9,11 +9,6 @@
 	final OpennetManager opennet;
 	private long timeLastSuccess;
 	
-    /** When did we last disconnect? Not Disconnected because a discrete event */
-    private long timeLastDisconnect;
-    /** Previous time of disconnection */
-    private long timePrevDisconnect;
-    
 	public OpennetPeerNode(SimpleFieldSet fs, Node node2, NodeCrypto crypto, OpennetManager opennet, PeerManager peers, boolean fromLocal, OutgoingPacketMangler mangler) throws FSParseException, PeerParseException, ReferenceSignatureVerificationException {
 		super(fs, node2, crypto, peers, fromLocal, mangler, true);
 		this.opennet = opennet;
@@ -70,20 +65,6 @@
     	return timeLastSuccess;
     }
     
-    public boolean disconnected(boolean dumpMessageQueue, boolean dumpTrackers) {
-    	if(super.disconnected(dumpMessageQueue, dumpTrackers)) {
-    		synchronized(this) {
-    			timePrevDisconnect = timeLastDisconnect;
-    			timeLastDisconnect = System.currentTimeMillis();
-    		}
-    		return true;
-    	} else return false;
-    }
-    
-    public synchronized long timeLastDisconnect() {
-    	return timeLastDisconnect;
-    }
-
     /**
      * Is the SimpleFieldSet a valid noderef?
      */

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java	2007-12-03 21:11:05 UTC (rev 16239)
+++ trunk/freenet/src/freenet/node/PeerNode.java	2007-12-03 21:15:32 UTC (rev 16240)
@@ -266,7 +266,11 @@
 	final WeakReference myRef;
 	/** The node is being disconnected, but it may take a while. */
 	private boolean disconnecting;
-	
+    /** When did we last disconnect? Not Disconnected because a discrete event */
+    long timeLastDisconnect;
+    /** Previous time of disconnection */
+    long timePrevDisconnect;
+    
 	/**
 	 * For FNP link setup:
 	 *  The initiator has to ensure that nonces send back by the
@@ -990,6 +994,10 @@
 			}
 			// Else DO NOT clear trackers, because hopefully it's a temporary connectivity glitch.
 			sendHandshakeTime = now;
+    		synchronized(this) {
+    			timePrevDisconnect = timeLastDisconnect;
+    			timeLastDisconnect = now;
+    		}
 		}
 		node.lm.lostOrRestartedNode(this);
 		setPeerNodeStatus(now);
@@ -3122,4 +3130,8 @@
 		// FIXME
 	}
 	
+    public synchronized long timeLastDisconnect() {
+    	return timeLastDisconnect;
+    }
+
 }