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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2008-07-02 16:03:42 +0000 (Wed, 02 Jul 2008)
New Revision: 20932

Modified:
   trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java
Log:
backport of r20310 (Probe requests: Always decrement, not just when getting 
closer to target.)

Modified: trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java  
2008-07-02 16:03:20 UTC (rev 20931)
+++ trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java  
2008-07-02 16:03:42 UTC (rev 20932)
@@ -122,10 +122,15 @@
                 return;
             }

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

-            htl = node.decrementHTL((hasForwarded ? next : source), htl);
+           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);    
+           }

             Message req = createDataRequest();