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

[t...@freenetproject.org]

Author: toad
Date: 2005-12-06 13:36:59 +0000 (Tue, 06 Dec 2005)
New Revision: 7679

Modified:
   trunk/freenet/src/freenet/node/InsertSender.java
   trunk/freenet/src/freenet/node/PeerManager.java
   trunk/freenet/src/freenet/node/Version.java
Log:
277: (mandatory)
We were mistakenly reporting RRNF.
Logging.

Modified: trunk/freenet/src/freenet/node/InsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/InsertSender.java    2005-12-06 12:44:45 UTC 
(rev 7678)
+++ trunk/freenet/src/freenet/node/InsertSender.java    2005-12-06 13:36:59 UTC 
(rev 7679)
@@ -484,7 +484,7 @@

         setStatusTime = System.currentTimeMillis();

-        if(code == ROUTE_NOT_FOUND && nodesWaitingForCompletion.isEmpty())
+        if(code == ROUTE_NOT_FOUND && !sentRequest)
                code = ROUTE_REALLY_NOT_FOUND;

         status = code;

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java     2005-12-06 12:44:45 UTC 
(rev 7678)
+++ trunk/freenet/src/freenet/node/PeerManager.java     2005-12-06 13:36:59 UTC 
(rev 7679)
@@ -305,10 +305,22 @@
         int count = 0;
         for(int i=0;i<peers.length;i++) {
             PeerNode p = peers[i];
-            if(routedTo.contains(p)) continue;
-            if(p == pn) continue;
-            if(!p.isConnected()) continue;
-            if(p.isBackedOff()) continue;
+            if(routedTo.contains(p)) {
+               Logger.minor(this, "Skipping (already routed to): 
"+p.getPeer());
+               continue;
+            }
+            if(p == pn) {
+               Logger.minor(this, "Skipping (req came from): "+p.getPeer());
+               continue;
+            }
+            if(!p.isConnected()) {
+               Logger.minor(this, "Skipping (not connected): "+p.getPeer());
+               continue;
+            }
+            if(p.isBackedOff()) {
+               Logger.minor(this, "Skipping (backed off): "+p.getPeer());
+               continue;
+            }
             count++;
             any = p;
             double diff = distance(p, loc);

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-12-06 12:44:45 UTC (rev 
7678)
+++ trunk/freenet/src/freenet/node/Version.java 2005-12-06 13:36:59 UTC (rev 
7679)
@@ -20,10 +20,10 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 276;
+       public static final int buildNumber = 277;

        /** Oldest build of Fred we will talk to */
-       public static final int lastGoodBuild = 276;
+       public static final int lastGoodBuild = 277;

        /** The highest reported build of fred */
        public static int highestSeenBuild = buildNumber;