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

[mrog...@freenetproject.org]

Author: mrogers
Date: 2006-07-28 23:48:24 +0000 (Fri, 28 Jul 2006)
New Revision: 9802

Modified:
   trunk/freenet/src/freenet/node/InsertHandler.java
   trunk/freenet/src/freenet/node/RequestHandler.java
   trunk/freenet/src/freenet/node/SSKInsertHandler.java
Log:
Reset HTL to maximum if location is the closest so far

Modified: trunk/freenet/src/freenet/node/InsertHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/InsertHandler.java   2006-07-28 19:32:31 UTC 
(rev 9801)
+++ trunk/freenet/src/freenet/node/InsertHandler.java   2006-07-28 23:48:24 UTC 
(rev 9802)
@@ -52,8 +52,10 @@
         closestLoc = req.getDouble(DMT.NEAREST_LOCATION);
         double targetLoc = key.toNormalizedDouble();
         double myLoc = node.lm.getLocation().getValue();
-        if(PeerManager.distance(targetLoc, myLoc) < 
PeerManager.distance(targetLoc, closestLoc))
+        if(PeerManager.distance(targetLoc, myLoc) < 
PeerManager.distance(targetLoc, closestLoc)) {
             closestLoc = myLoc;
+            htl = Node.MAX_HTL;
+        }
     }

     public String toString() {

Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java  2006-07-28 19:32:31 UTC 
(rev 9801)
+++ trunk/freenet/src/freenet/node/RequestHandler.java  2006-07-28 23:48:24 UTC 
(rev 9802)
@@ -45,8 +45,10 @@
         // FIXME should be more generic when implement SSKs
         key = (Key) req.getObject(DMT.FREENET_ROUTING_KEY);
         double keyLoc = key.toNormalizedDouble();
-        if(PeerManager.distance(keyLoc, myLoc) < PeerManager.distance(keyLoc, 
closestLoc))
+        if(PeerManager.distance(keyLoc, myLoc) < PeerManager.distance(keyLoc, 
closestLoc)) {
             closestLoc = myLoc;
+            htl = Node.MAX_HTL;
+        }
         if(key instanceof NodeSSK)
                needsPubKey = m.getBoolean(DMT.NEED_PUB_KEY);
     }

Modified: trunk/freenet/src/freenet/node/SSKInsertHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/SSKInsertHandler.java        2006-07-28 
19:32:31 UTC (rev 9801)
+++ trunk/freenet/src/freenet/node/SSKInsertHandler.java        2006-07-28 
23:48:24 UTC (rev 9802)
@@ -48,8 +48,10 @@
         closestLoc = req.getDouble(DMT.NEAREST_LOCATION);
         double targetLoc = key.toNormalizedDouble();
         double myLoc = node.lm.getLocation().getValue();
-        if(PeerManager.distance(targetLoc, myLoc) < 
PeerManager.distance(targetLoc, closestLoc))
+        if(PeerManager.distance(targetLoc, myLoc) < 
PeerManager.distance(targetLoc, closestLoc)) {
             closestLoc = myLoc;
+            htl = Node.MAX_HTL;
+        }
         byte[] pubKeyHash = 
((ShortBuffer)req.getObject(DMT.PUBKEY_HASH)).getData();
         pubKey = node.getKey(pubKeyHash);
         data = ((ShortBuffer) req.getObject(DMT.DATA)).getData();