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

[t...@freenetproject.org]

Author: toad
Date: 2008-06-13 16:11:21 +0000 (Fri, 13 Jun 2008)
New Revision: 20310

Modified:
   trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java
Log:
Probe requests: Always decrement, not just when getting closer to target. (Left 
over from old HTL system).

Modified: trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java  
2008-06-13 15:53:03 UTC (rev 20309)
+++ trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java  
2008-06-13 16:11:21 UTC (rev 20310)
@@ -122,15 +122,10 @@
                 return;
             }

-            double nextValue=next.getLocation();
-                       
             if(logMINOR) Logger.minor(this, "Routing request to "+next);
             nodesRoutedTo.add(next);

-            if(Location.distance(target, nextValue, true) > 
Location.distance(target, nearestLoc, true)) {
-                htl = node.decrementHTL((hasForwarded ? next : source), htl);
-                if(logMINOR) Logger.minor(this, "Backtracking: 
target="+target+" next="+nextValue+" closest="+nearestLoc+" so htl="+htl);
-            }
+            htl = node.decrementHTL((hasForwarded ? next : source), htl);

             Message req = createDataRequest();