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

[t...@freenetproject.org]

Author: toad
Date: 2008-02-19 17:30:32 +0000 (Tue, 19 Feb 2008)
New Revision: 18071

Modified:
   trunk/freenet/src/freenet/node/AnnounceSender.java
Log:
Actually it's simpler to always decrement.

Modified: trunk/freenet/src/freenet/node/AnnounceSender.java
===================================================================
--- trunk/freenet/src/freenet/node/AnnounceSender.java  2008-02-19 17:28:43 UTC 
(rev 18070)
+++ trunk/freenet/src/freenet/node/AnnounceSender.java  2008-02-19 17:30:32 UTC 
(rev 18071)
@@ -45,7 +45,6 @@
                this.node = node;
                this.onlyNode = null;
                htl = (short) Math.min(m.getShort(DMT.HTL), node.maxHTL());
-       htl = node.decrementHTL(source, htl);
                target = m.getDouble(DMT.TARGET_LOCATION); // FIXME validate
                logMINOR = Logger.shouldLog(Logger.MINOR, this);
                cb = null;
@@ -123,8 +122,7 @@
             if(logMINOR) Logger.minor(this, "Routing request to "+next);
             nodesRoutedTo.add(next);

-            if(hasForwarded)
-               htl = node.decrementHTL(source, htl);
+               htl = node.decrementHTL(source, htl);

             long xferUID = sendTo(next);
             if(xferUID == -1) continue;