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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-12-01 15:25:47 +0000 (Sat, 01 Dec 2007)
New Revision: 16183

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
JFK: more rekeying related fixes

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2007-12-01 15:14:36 UTC 
(rev 16182)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2007-12-01 15:25:47 UTC 
(rev 16183)
@@ -1479,6 +1479,7 @@
                KeyTracker newTracker = new KeyTracker(this, encCipher, encKey);
                changedIP(replyTo);
                boolean bootIDChanged = false;
+               boolean wasARekey = false;
                KeyTracker oldPrev = null;
                KeyTracker oldCur = null;
                KeyTracker prev = null;
@@ -1489,7 +1490,8 @@
                        if(!isConnected) {
                                connectedTime = now;
                                sentInitialMessages = false;
-                       }
+                       } else
+                               wasARekey = true;
                        isConnected = true;
                        isRoutable = routable;
                        verifiedIncompatibleNewerVersion = newer;
@@ -1543,7 +1545,7 @@

                if(newer || older || !isConnected())
                        node.peers.disconnected(this);
-               else {
+               else if(!wasARekey) {
                        node.peers.addConnectedPeer(this);
                        onConnect();
                }