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

[t...@freenetproject.org]

Author: toad
Date: 2007-07-03 15:37:36 + (Tue, 03 Jul 2007)
New Revision: 13903

Modified:
   trunk/freenet/src/freenet/node/NodeDispatcher.java
Log:
Don't reject a rejection!
Send the rejections to the right place

Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===
--- trunk/freenet/src/freenet/node/NodeDispatcher.java  2007-07-03 15:24:49 UTC 
(rev 13902)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java  2007-07-03 15:37:36 UTC 
(rev 13903)
@@ -660,7 +660,7 @@
ctx.nearest = nearest;
ctx.htl = htl;
} else {
-   htl = node.decrementHTL(src, htl);
+   htl = node.decrementHTL(origSource, htl);
ctx.htl = htl;
if(logMINOR)
Logger.minor(this, "Updated htl to "+htl+" - 
myLoc="+myLoc+", target="+target+", nearest="+nearest);
@@ -668,13 +668,13 @@

// Complete ?
if(htl == 0) {
-   if(src != null) {
+   if(origSource != null) {
// Complete
Message complete = DMT.createFNPProbeReply(id, 
target, nearest, best, counter++, linearCounter);
Message sub = 
DMT.createFNPBestRoutesNotTaken((Double[])locsNotVisited.toArray(new 
Double[locsNotVisited.size()]));
complete.addSubMessage(sub);
try {
-   src.sendAsync(complete, null, 0, null);
+   origSource.sendAsync(complete, null, 0, 
null);
} catch (NotConnectedException e) {
Logger.error(this, "Not connected 
completing a probe request from "+src);
}
@@ -962,7 +962,7 @@
for(int i=0;i

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

[toad]

Author: toad
Date: 2007-07-03 15:37:36 + (Tue, 03 Jul 2007)
New Revision: 13903

Modified:
   trunk/freenet/src/freenet/node/NodeDispatcher.java
Log:
Don't reject a rejection!
Send the rejections to the right place

Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===
--- trunk/freenet/src/freenet/node/NodeDispatcher.java  2007-07-03 15:24:49 UTC 
(rev 13902)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java  2007-07-03 15:37:36 UTC 
(rev 13903)
@@ -660,7 +660,7 @@
ctx.nearest = nearest;
ctx.htl = htl;
} else {
-   htl = node.decrementHTL(src, htl);
+   htl = node.decrementHTL(origSource, htl);
ctx.htl = htl;
if(logMINOR)
Logger.minor(this, "Updated htl to "+htl+" - 
myLoc="+myLoc+", target="+target+", nearest="+nearest);
@@ -668,13 +668,13 @@
 
// Complete ?
if(htl == 0) {
-   if(src != null) {
+   if(origSource != null) {
// Complete
Message complete = DMT.createFNPProbeReply(id, 
target, nearest, best, counter++, linearCounter);
Message sub = 
DMT.createFNPBestRoutesNotTaken((Double[])locsNotVisited.toArray(new 
Double[locsNotVisited.size()]));
complete.addSubMessage(sub);
try {
-   src.sendAsync(complete, null, 0, null);
+   origSource.sendAsync(complete, null, 0, 
null);
} catch (NotConnectedException e) {
Logger.error(this, "Not connected 
completing a probe request from "+src);
}
@@ -962,7 +962,7 @@
for(int i=0;ihttp://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs