Author: toad
Date: 2008-11-27 22:16:35 +0000 (Thu, 27 Nov 2008)
New Revision: 23922

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Deal with changing boot ID during rekey properly.


Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2008-11-27 20:44:15 UTC 
(rev 23921)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2008-11-27 22:16:35 UTC 
(rev 23922)
@@ -1877,9 +1877,13 @@
                        unroutableNewerVersion = newer;
                        unroutableOlderVersion = older;
                        bootIDChanged = (thisBootID != this.bootID);
-                       if(bootIDChanged && wasARekey)
+                       if(bootIDChanged && wasARekey) {
                                Logger.error(this, "Changed boot ID while 
rekeying! from " + bootID + " to " + thisBootID + " for " + getPeer());
-                       else if(bootIDChanged && logMINOR)
+                               wasARekey = false;
+                               connectedTime = now;
+                               countSelectionsSinceConnected = 0;
+                               sentInitialMessages = false;
+                       } else if(bootIDChanged && logMINOR)
                                Logger.minor(this, "Changed boot ID from " + 
bootID + " to " + thisBootID + " for " + getPeer());
                        this.bootID = thisBootID;
                        if(bootIDChanged) {

_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to