Author: zothar
Date: 2006-06-09 15:12:34 +0000 (Fri, 09 Jun 2006)
New Revision: 9098
Modified:
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Restart the sentHandshake()/couldNotSendHandshake() refactor effort, taking it
slowly this time. Testing seems to say everything is normal in these past few
commits.
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2006-06-09 14:27:41 UTC
(rev 9097)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2006-06-09 15:12:34 UTC
(rev 9098)
@@ -819,13 +819,8 @@
}
boolean firstHandshake = true;
-
- /**
- * Call this method when a handshake request has been
- * sent.
- */
- public void sentHandshake() {
- Logger.debug(this, "sentHandshake(): "+this);
+
+ private void calcNextHandshake(boolean couldSendHandshake) {
long now = -1;
synchronized(this) {
now = System.currentTimeMillis();
@@ -861,6 +856,15 @@
}
/**
+ * Call this method when a handshake request has been
+ * sent.
+ */
+ public void sentHandshake() {
+ Logger.debug(this, "sentHandshake(): "+this);
+ calcNextHandshake(true);
+ }
+
+ /**
* Call this method when a handshake request could not be sent (i.e. no IP
address available)
* sent.
*/
