Author: toad
Date: 2006-09-02 22:50:04 +0000 (Sat, 02 Sep 2006)
New Revision: 10377
Modified:
trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
trunk/freenet/src/freenet/node/NodeDispatcher.java
trunk/freenet/src/freenet/node/Version.java
Log:
963: More probe requests fixes, and some logging. Will not be inserted to
auto-update on darknet yet; testnet only.
Modified: trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
2006-09-02 22:13:30 UTC (rev 10376)
+++ trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
2006-09-02 22:50:04 UTC (rev 10377)
@@ -157,6 +157,7 @@
}
if(e.code == LowLevelPutException.ROUTE_NOT_FOUND) {
consecutiveRNFs++;
+ if(logMINOR) Logger.minor(this, "Consecutive RNFs:
"+consecutiveRNFs+" / "+ctx.consecutiveRNFsCountAsSuccess);
if(consecutiveRNFs ==
ctx.consecutiveRNFsCountAsSuccess) {
if(logMINOR) Logger.minor(this, "Consecutive
RNFs: "+consecutiveRNFs+" - counting as success");
onSuccess();
Modified: trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
2006-09-02 22:13:30 UTC (rev 10376)
+++ trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
2006-09-02 22:50:04 UTC (rev 10377)
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.3.5 on 02/09/06 21:32 */
+/* The following code was generated by JFlex 1.3.5 on 02/09/06 23:32 */
package freenet.clients.http.filter;
import java.io.*;
@@ -11,7 +11,7 @@
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/";>JFlex</a> 1.3.5
- * on 02/09/06 21:32 from the specification file
+ * on 02/09/06 23:32 from the specification file
* <tt>file:/usr/src/cvs/eclipse-workspace/Freenet
0.7/src/freenet/clients/http/filter/CSSTokenizerFilter.jflex</tt>
*/
class CSSTokenizerFilter {
Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java 2006-09-02 22:13:30 UTC
(rev 10376)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java 2006-09-02 22:50:04 UTC
(rev 10377)
@@ -463,11 +463,11 @@
Logger.minor(this, "Probe request popped "+o);
}
}
- return innerHandleProbeRequest(src, id, lid, target, best,
nearest, htl, counter, true);
+ return innerHandleProbeRequest(src, id, lid, target, best,
nearest, htl, counter, true, true);
}
private boolean innerHandleProbeRequest(PeerNode src, long id, Long lid,
double target, double best,
- double nearest, short htl, short counter, boolean checkRecent) {
+ double nearest, short htl, short counter, boolean checkRecent,
boolean canReject) {
if(htl > Node.MAX_HTL) htl = Node.MAX_HTL;
if(htl <= 1) htl = 1;
ProbeContext ctx = null;
@@ -502,8 +502,8 @@
}
// FIXME Update any important values on ctx
if(ctx.counter < counter) ctx.counter = counter;
- double oldDist = PeerManager.distance(ctx.nearest, target);
- double newDist = PeerManager.distance(nearest, target);
+ double oldDist = Math.abs(PeerManager.distance(ctx.nearest,
target));
+ double newDist = Math.abs(PeerManager.distance(nearest,
target));
// FIXME use this elsewhere? Does it make sense?
if(oldDist > newDist) {
ctx.htl = htl;
@@ -574,11 +574,15 @@
if(pn == null) {
// Can't complete, because some HTL left
// Reject: RNF
- Message reject = DMT.createFNPProbeRejected(id,
target, nearest, best, counter, htl, DMT.PROBE_REJECTED_RNF);
- try {
- src.sendAsync(reject, null, 0, null);
- } catch (NotConnectedException e) {
- Logger.error(this, "Not connected
rejecting a probe request from "+src);
+ if(canReject) {
+ Message reject =
DMT.createFNPProbeRejected(id, target, nearest, best, counter, htl,
DMT.PROBE_REJECTED_RNF);
+ try {
+ src.sendAsync(reject, null, 0,
null);
+ } catch (NotConnectedException e) {
+ Logger.error(this, "Not
connected rejecting a probe request from "+src);
+ }
+ } else {
+ Logger.error(this, "Completed Probe
request # "+id+" - RNF");
}
return true;
}
@@ -653,7 +657,7 @@
recentProbeContexts.popValue();
}
- return innerHandleProbeRequest(src, id, lid, target, best,
nearest, htl, counter, false);
+ return innerHandleProbeRequest(src, id, lid, target, best,
nearest, htl, counter, false, false);
}
public void startProbe(double d) {
@@ -662,7 +666,7 @@
synchronized(recentProbeRequestIDs) {
recentProbeRequestIDs.push(ll);
}
- innerHandleProbeRequest(null, l, ll, d, 2.0, 2.0, Node.MAX_HTL,
(short)0, false);
+ innerHandleProbeRequest(null, l, ll, d, 2.0, 2.0, Node.MAX_HTL,
(short)0, false, false);
}
}
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-09-02 22:13:30 UTC (rev
10376)
+++ trunk/freenet/src/freenet/node/Version.java 2006-09-02 22:50:04 UTC (rev
10377)
@@ -21,7 +21,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 962;
+ private static final int buildNumber = 963;
/** Oldest build of Fred we will talk to */
private static final int oldLastGoodBuild = 950;
