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

[t...@freenetproject.org]

Author: toad
Date: 2005-11-24 21:41:30 +0000 (Thu, 24 Nov 2005)
New Revision: 7588

Modified:
   trunk/freenet/src/freenet/node/InsertSender.java
   trunk/freenet/src/freenet/node/PeerManager.java
   trunk/freenet/src/freenet/node/Version.java
Log:
208: (mandatory)
Fix insert stats bug.

Modified: trunk/freenet/src/freenet/node/InsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/InsertSender.java    2005-11-24 21:21:33 UTC 
(rev 7587)
+++ trunk/freenet/src/freenet/node/InsertSender.java    2005-11-24 21:41:30 UTC 
(rev 7588)
@@ -144,11 +144,13 @@
             if(msg == null || msg.getSpec() == DMT.FNPRejectedOverload) {
                 // Overload... hmmmm - propagate error back to source
                 Logger.error(this, "Propagating "+msg+" back to source on 
"+this);
+                next.insertRejectedOverload();
                 finish(REJECTED_OVERLOAD, next);
                 return;
             }

             if(msg.getSpec() == DMT.FNPRejectedLoop) {
+                       next.insertDidNotRejectOverload();
                 // Loop - we don't want to send the data to this one
                 continue;
             }

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java     2005-11-24 21:21:33 UTC 
(rev 7587)
+++ trunk/freenet/src/freenet/node/PeerManager.java     2005-11-24 21:41:30 UTC 
(rev 7588)
@@ -301,6 +301,7 @@
             count++;
             any = p;
             double diff = distance(p, loc);
+            Logger.minor(this, "p.loc="+p.getLocation().getValue()+", 
loc="+loc+", d="+distance(p.getLocation().getValue(), loc)+" usedD="+diff);
             if((!ignoreSelf) && diff > maxDiff) continue;
             if(diff < bestDiff) {
                 best = p;

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-11-24 21:21:33 UTC (rev 
7587)
+++ trunk/freenet/src/freenet/node/Version.java 2005-11-24 21:41:30 UTC (rev 
7588)
@@ -20,10 +20,10 @@
        public static final String protocolVersion = "1.0";

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

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

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