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

[t...@freenetproject.org]

Author: toad
Date: 2008-01-31 19:38:54 +0000 (Thu, 31 Jan 2008)
New Revision: 17437

Modified:
   trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java
Log:
Catch traces

Modified: trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java  
2008-01-31 19:21:49 UTC (rev 17436)
+++ trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java  
2008-01-31 19:38:54 UTC (rev 17437)
@@ -70,6 +70,7 @@
         this.linearCounter = 1;
         this.uniqueCounter = 1;
         logMINOR = Logger.shouldLog(Logger.MINOR, this);
+       updateBest();
     }

     public void start() {
@@ -88,7 +89,6 @@
     }

     private void realRun() {
-       updateBest();
                int routeAttempts=0;
                int rejectOverloads=0;
         HashSet nodesRoutedTo = new HashSet();
@@ -239,7 +239,8 @@
                 MessageFilter mfRouteNotFound = 
MessageFilter.create().setSource(next).setField(DMT.UID, 
uid).setTimeout(FETCH_TIMEOUT).setType(DMT.FNPRouteNotFound);
                 MessageFilter mfRejectedOverload = 
MessageFilter.create().setSource(next).setField(DMT.UID, 
uid).setTimeout(FETCH_TIMEOUT).setType(DMT.FNPRejectedOverload);
                 MessageFilter mfPubKey = 
MessageFilter.create().setSource(next).setField(DMT.UID, 
uid).setTimeout(FETCH_TIMEOUT).setType(DMT.FNPSSKPubKey);
-                MessageFilter mf = 
mfRouteNotFound.or(mfRejectedOverload.or(mfDF.or(mfPubKey)));
+                MessageFilter mfTrace = 
MessageFilter.create().setSource(next).setField(DMT.UID, 
uid).setTimeout(FETCH_TIMEOUT).setType(DMT.FNPRHProbeTrace);
+                MessageFilter mf = 
mfRouteNotFound.or(mfRejectedOverload.or(mfDF.or(mfPubKey.or(mfTrace))));


                try {