Update of /cvsroot/freenet/freenet/src/freenet/node/states/announcement
In directory sc8-pr-cvs1:/tmp/cvs-serv2553/src/freenet/node/states/announcement
Modified Files:
Tag: ngrouting
AnnouncementDone.java AnnouncementState.java
CompletePending.java ExecutePending.java LastNode.java
ReplyPending.java
Log Message:
add some missing route terminations
Index: AnnouncementDone.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcement/AnnouncementDone.java,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -r1.2 -r1.2.6.1
--- AnnouncementDone.java 2 Nov 2002 22:44:40 -0000 1.2
+++ AnnouncementDone.java 29 Aug 2003 23:27:38 -0000 1.2.6.1
@@ -12,8 +12,9 @@
public AnnouncementDone(AnnouncementState st) {
super(st);
+ terminateRouting(false, false);
}
-
+
public String getName() {
return "Announcement Done";
}
Index: AnnouncementState.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcement/AnnouncementState.java,v
retrieving revision 1.4
retrieving revision 1.4.6.1
diff -u -r1.4 -r1.4.6.1
--- AnnouncementState.java 22 May 2003 18:14:20 -0000 1.4
+++ AnnouncementState.java 29 Aug 2003 23:27:38 -0000 1.4.6.1
@@ -134,6 +134,13 @@
} catch (IOException e) {}
}
}
+
+ public void terminateRouting(boolean success, boolean routingRelated) {
+ if(routes != null) {
+ routes.terminate(success, routingRelated);
+ routes = null;
+ }
+ }
}
Index: CompletePending.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcement/CompletePending.java,v
retrieving revision 1.6.6.1
retrieving revision 1.6.6.2
diff -u -r1.6.6.1 -r1.6.6.2
--- CompletePending.java 26 Jul 2003 01:16:47 -0000 1.6.6.1
+++ CompletePending.java 29 Aug 2003 23:27:39 -0000 1.6.6.2
@@ -40,7 +40,8 @@
// insert into Routing table
n.reference(k, announcee);
-
+
+ terminateRouting(false, false);
// since we have added the reference
return new AnnouncementDone(this);
}
@@ -124,7 +125,7 @@
n.logger.log(this, "Failed to send AnnouncementComplete",
e, n.logger.MINOR);
}
-
+ terminateRouting(false, false);
// since we've added the ref
return new AnnouncementDone(this);
}
Index: ExecutePending.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcement/ExecutePending.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- ExecutePending.java 30 Jun 2003 14:32:42 -0000 1.3
+++ ExecutePending.java 29 Aug 2003 23:27:39 -0000 1.3.2.1
@@ -60,6 +60,7 @@
e, Logger.DEBUG);
}
+ terminateRouting(false, false);
return new AnnouncementDone(this);
}
@@ -75,7 +76,8 @@
n.logger.log(this, "Failed to send QueryAborted after no Execute",
e, Logger.DEBUG);
}
-
+
+ terminateRouting(false, false);
return new AnnouncementDone(this);
}
@@ -101,6 +103,7 @@
return cp.received(n, nc);
}
} else {
+ terminateRouting(false, false);
QueryAborted qa = new QueryAborted(id);
AnnouncementFailed af =
new AnnouncementFailed(id,
Index: LastNode.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/announcement/LastNode.java,v
retrieving revision 1.6.6.1
retrieving revision 1.6.6.2
diff -u -r1.6.6.1 -r1.6.6.2
--- LastNode.java 26 Jul 2003 01:16:47 -0000 1.6.6.1
+++ LastNode.java 29 Aug 2003 23:27:39 -0000 1.6.6.2
@@ -15,6 +15,7 @@
public LastNode(AnnouncementState as, NoExecute ne) {
super(as, ne, bCopy(as.myVal));
+ terminateRouting(false, false);
}
private static byte[] bCopy(byte[] b) {
Index: ReplyPending.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcement/ReplyPending.java,v
retrieving revision 1.7
retrieving revision 1.7.6.1
diff -u -r1.7 -r1.7.6.1
--- ReplyPending.java 19 Apr 2003 15:32:55 -0000 1.7
+++ ReplyPending.java 29 Aug 2003 23:27:39 -0000 1.7.6.1
@@ -53,7 +53,8 @@
n.logger.log(this, "Failed to forward " + qa +": "+e,
Logger.MINOR);
}
-
+
+ terminateRouting(false, false);
return new AnnouncementDone(this);
}
@@ -86,6 +87,7 @@
routes.timedOut();
if (!sendQueryRestarted(n, new QueryRestarted(id))) {
+ terminateRouting(false, false);
return new AnnouncementDone(this);
}
try {
@@ -114,6 +116,7 @@
nr.cancel();
if (!sendQueryRestarted(n, new QueryRestarted(id))) {
+ terminateRouting(false, false);
return new AnnouncementDone(this);
}
@@ -132,11 +135,11 @@
nr = new NoReply(id);
n.schedule(getTime(hopsToLive), nr);
- if (!sendQueryRestarted(n, qr))
+ if (!sendQueryRestarted(n, qr)) {
+ terminateRouting(false, false);
return new AnnouncementDone(this);
- else
+ } else
return this;
-
}
public State receivedMessage(Node n, AnnouncementFailed af)
@@ -152,6 +155,7 @@
n.logger.log(this, "Failed to send AnnouncementFailed",
e, n.logger.MINOR);
}
+ terminateRouting(false, false);
return new AnnouncementDone(this);
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
