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

[t...@freenetproject.org]

Author: toad
Date: 2007-04-20 15:21:53 +0000 (Fri, 20 Apr 2007)
New Revision: 12812

Modified:
   trunk/freenet/src/freenet/node/NodeDispatcher.java
Log:
wire in fnp trace

Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java  2007-04-20 15:18:28 UTC 
(rev 12811)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java  2007-04-20 15:21:53 UTC 
(rev 12812)
@@ -126,6 +126,8 @@
                        return handleProbeReply(m, source);
                } else if(spec == DMT.FNPProbeRejected) {
                        return handleProbeRejected(m, source);
+               } else if(spec == DMT.FNPProbeTrace) {
+                       return handleProbeTrace(m, source);
                }
                return false;
        }
@@ -636,14 +638,15 @@

                        visited.add(pn);

-                       Message trace =
-                               DMT.createFNPProbeTrace(id, target, nearest, 
best, htl, counter, myLoc, node.swapIdentifier, 
LocationManager.extractLocs(peers), LocationManager.extractUIDs(peers));
-                       if(src != null)
+                       if(src != null) {
+                               Message trace =
+                                       DMT.createFNPProbeTrace(id, target, 
nearest, best, htl, counter, myLoc, node.swapIdentifier, 
LocationManager.extractLocs(peers), LocationManager.extractUIDs(peers));
                                try {
                                        src.sendAsync(trace, null, 0, null);
                                } catch (NotConnectedException e1) {
                                        // Ignore
                                }
+                       }

                        Message forwarded =
                                DMT.createFNPProbeRequest(id, target, nearest, 
best, htl, counter++);