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

[t...@freenetproject.org]

Author: toad
Date: 2008-02-18 13:51:01 +0000 (Mon, 18 Feb 2008)
New Revision: 18039

Modified:
   trunk/freenet/src/freenet/node/ResettingHTLProbeRequestHandler.java
   trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java
Log:
Send the probe trace *after* updating nearest and best.

Modified: trunk/freenet/src/freenet/node/ResettingHTLProbeRequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/ResettingHTLProbeRequestHandler.java 
2008-02-18 13:44:15 UTC (rev 18038)
+++ trunk/freenet/src/freenet/node/ResettingHTLProbeRequestHandler.java 
2008-02-18 13:51:01 UTC (rev 18039)
@@ -46,16 +46,16 @@
                ResettingHTLProbeRequestHandler handler = 
                        new ResettingHTLProbeRequestHandler(source, uid, 
sender);
                sender.addListener(handler);
-               sender.start();
                PeerNode[] peers = n.peers.connectedPeers;
                Message accepted = DMT.createFNPAccepted(uid);
-               Message trace = DMT.createFNPRHProbeTrace(uid, nearestLoc, 
best, htl, (short)1, (short)1, n.getLocation(), n.swapIdentifier, 
LocationManager.extractLocs(peers, true), LocationManager.extractUIDs(peers), 
(short)0, (short)1, "", source.swapIdentifier);
+               Message trace = DMT.createFNPRHProbeTrace(uid, 
sender.getNearestLoc(), sender.getBest(), htl, (short)1, (short)1, 
n.getLocation(), n.swapIdentifier, LocationManager.extractLocs(peers, true), 
LocationManager.extractUIDs(peers), (short)0, (short)1, "", 
source.swapIdentifier);
                try {
                        source.sendAsync(accepted, null, 0, sender);
                        source.sendAsync(trace, null, 0, sender);
                } catch (NotConnectedException e) {
                        // Ignore, sender will pick up
                }
+               sender.start();
        }

        public void onCompletion(double nearest, double best, short counter, 
short uniqueCounter, short linearCounter) throws NotConnectedException {

Modified: trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java  
2008-02-18 13:44:15 UTC (rev 18038)
+++ trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java  
2008-02-18 13:51:01 UTC (rev 18039)
@@ -540,4 +540,12 @@
                return NativeThread.HIGH_PRIORITY;
        }

+       double getBest() {
+               return best;
+       }
+
+       public double getNearestLoc() {
+               return nearestLoc;
+       }
+
 }