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

[t...@freenetproject.org]

Author: toad
Date: 2007-09-26 12:42:51 +0000 (Wed, 26 Sep 2007)
New Revision: 15322

Modified:
   trunk/freenet/src/freenet/node/PeerManager.java
Log:
DO NOT WRITE OPENNET PEERS LIST TO OLD-OPENNET-PEERS FILE!!!!!!!

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java     2007-09-26 12:29:52 UTC 
(rev 15321)
+++ trunk/freenet/src/freenet/node/PeerManager.java     2007-09-26 12:42:51 UTC 
(rev 15322)
@@ -126,10 +126,12 @@
      */
     void tryReadPeers(String filename, NodeCrypto crypto, OpennetManager 
opennet, boolean isOpennet, boolean oldOpennetPeers) {
        synchronized(writePeersSync) {
-               if(isOpennet) {
-                       openFilename = filename;
-               } else {
-                       darkFilename = filename;
+               if(!oldOpennetPeers) {
+                       if(isOpennet) {
+                               openFilename = filename;
+                       } else {
+                               darkFilename = filename;
+                       }
                }
        }
        OutgoingPacketMangler mangler = crypto.packetMangler;
@@ -139,10 +141,12 @@
        if(peersFile.exists()) {
                if(readPeers(peersFile, mangler, crypto, opennet, isOpennet, 
oldOpennetPeers)) {
                    String msg;
-                   if(isOpennet) {
-                           msg = "Read "+getOpennetPeers().length+" peers from 
"+peersFile;
+                   if(oldOpennetPeers) {
+                       msg = "Read "+opennet.countOldOpennetPeers()+" 
old-opennet-peers from "+peersFile;
+                   } else if(isOpennet) {
+                           msg = "Read "+getOpennetPeers().length+" opennet 
peers from "+peersFile;
                                } else {
-                           msg = "Read "+getDarknetPeers().length+" peers from 
"+peersFile;
+                           msg = "Read "+getDarknetPeers().length+" darknet 
peers from "+peersFile;
                                }
                        Logger.normal(this, msg);
                        System.out.println(msg);
@@ -153,10 +157,12 @@
        if(backupFile.exists()) {
                if(readPeers(backupFile, mangler, crypto, opennet, isOpennet, 
oldOpennetPeers)) {
                    String msg;
-                   if(isOpennet) {
-                           msg = "Read "+getOpennetPeers().length+" peers from 
"+backupFile;
+                   if(oldOpennetPeers) {
+                       msg = "Read "+opennet.countOldOpennetPeers()+" 
old-opennet-peers from "+peersFile;
+                   } else if(isOpennet) {
+                           msg = "Read "+getOpennetPeers().length+" opennet 
peers from "+peersFile;
                                } else {
-                           msg = "Read "+getDarknetPeers().length+" peers from 
"+backupFile;
+                           msg = "Read "+getDarknetPeers().length+" darknet 
peers from "+peersFile;
                                }
                        Logger.normal(this, msg);
                        System.out.println(msg);