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

[t...@freenetproject.org]

Author: toad
Date: 2008-04-05 11:47:38 +0000 (Sat, 05 Apr 2008)
New Revision: 19011

Modified:
   trunk/freenet/src/freenet/node/ResettingHTLProbeRequestHandler.java
   trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java
Log:
Make ResettingHTLProbeRequest* be routed exactly as normal requests are: no 
nearestLoc-dependant resetting.

Modified: trunk/freenet/src/freenet/node/ResettingHTLProbeRequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/ResettingHTLProbeRequestHandler.java 
2008-04-05 11:35:52 UTC (rev 19010)
+++ trunk/freenet/src/freenet/node/ResettingHTLProbeRequestHandler.java 
2008-04-05 11:47:38 UTC (rev 19011)
@@ -32,14 +32,7 @@
                double best = m.getDouble(DMT.BEST_LOCATION);
                short htl = m.getShort(DMT.HTL);
                if(htl > n.maxHTL()) htl = n.maxHTL();
-               double nodeLoc = n.getLocation();
                boolean resetNearestLoc = false;
-               if(Location.distance(nodeLoc, target, true) <
-                               Location.distance(nearestLoc, target, true)) {
-                       nearestLoc = nodeLoc;
-                       htl = Node.DEFAULT_MAX_HTL;
-                       resetNearestLoc = true;
-               }
                ResettingHTLProbeRequestSender sender =
                        new ResettingHTLProbeRequestSender(target, htl, uid, n, 
nearestLoc, resetNearestLoc,
                                        source, best);

Modified: trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java  
2008-04-05 11:35:52 UTC (rev 19010)
+++ trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java  
2008-04-05 11:47:38 UTC (rev 19011)
@@ -38,7 +38,6 @@

     // Basics
     final double target;
-    final boolean resetNearestLoc;
     private short htl;
     private double best;
     private short counter;
@@ -71,7 +70,6 @@
         this.node = n;
         this.source = source;
         this.nearestLoc = nearestLoc;
-        this.resetNearestLoc = resetNearestLoc;
         this.target = target;
         this.best = best;
         this.counter = 1;