Update of /cvsroot/freenet/freenet/src/freenet/node/states/request
In directory sc8-pr-cvs1:/tmp/cvs-serv16753/src/freenet/node/states/request
Modified Files:
Pending.java
Log Message:
6224:
More debugging of PeerHandler and supporting microarchitectural changes.
- Splitfile fetch between 2 test nodes works again, rather than failing with RNFs.
- Fix totalDataSent i.e. fix OCM's report of total data sent on a conn
- Encrypt data at send time. Not in advance in packet.
- Locking changes.
- Add hasTrailer() to Message. Implement it on all Messages.
- Make a distinction between needsConnection as in can we route to it, or do we want a
new connection if possible.
- Keep separate queues for messages with and without trailers in PeerHandler.
- Messages without trailers take priority.
- needConnection(true) returns false if we have no messages queued and no trailers
sending and we are not in the RT.
- Remove closed conns from the PeerHandler when we find them. They will still be in
the OCM.
- SendData: Count size of padding sent the same way we count the non-padding - don't
add it on and therefore don't finish until after we have sent it.
Add a TODO about the data: protocol
- Cancel outwardSender callback in Pending after we get Accepted. We may have a bug
causing notifications to be lost.
- Fix possible NPE in FnpLink.encryptBytes.
Logging
Also some fixes and optimizations since 6223 by other people.
Index: Pending.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/request/Pending.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- Pending.java 4 Oct 2003 22:29:34 -0000 1.64
+++ Pending.java 8 Oct 2003 22:54:18 -0000 1.65
@@ -366,9 +366,15 @@
acceptedTime = System.currentTimeMillis();
accepted = true;
routes.routeAccepted();
+ if(outwardSender != null) {
+ n.logger.log(this, "Got Accepted before got SendFinished on "+
+ this, Logger.ERROR /* FIXME */);
+ outwardSender.cancel();
+ outwardSender = null;
+ }
}
}
-
+
State receivedDataReply(Node n, DataReply dr) throws BadStateException {
if (!fromLastPeer(dr)) {
throw new BadStateException("DataReply from wrong peer!");
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
