Update of /cvsroot/freenet/freenet/src/freenet/node/states/request
In directory sc8-pr-cvs1:/tmp/cvs-serv13542/src/freenet/node/states/request
Modified Files:
RequestSendCallback.java SendFinished.java
Log Message:
6179:
Fix zab's deadlocks.
Add setTrailerStream to MessageSendCallback. Now we can theoretically send any message
fully async (we don't yet use it except in the below).
Add some new files, PeerHandler, PeerPacket, PeerPacketMessage, which will be used for
a major refactoring of ConnectionHandler and separation of the message queue into a
per-peer thing, rather than a per-connection thing. Not integrated yet, so should be
harmless.
toString(), logging. Add log messages for long messageInitialStateTime's.
Add getCipher() to CipherOutputStream, for future use in refactoring and possibly
elsewhere, and Link.encryptBytes(byte[]) for similar use.
Index: RequestSendCallback.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/request/RequestSendCallback.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RequestSendCallback.java 14 Aug 2003 02:06:48 -0000 1.2
+++ RequestSendCallback.java 8 Sep 2003 17:03:04 -0000 1.3
@@ -5,6 +5,7 @@
import freenet.node.Node;
import freenet.node.State;
import freenet.CommunicationException;
+import java.io.OutputStream;
public class RequestSendCallback implements MessageSendCallback {
String m;
@@ -15,6 +16,8 @@
this.n = n;
this.parent = parent;
}
+
+ public void setTrailerStream(OutputStream os) { };
public void succeeded() {
if(n.logger.shouldLog(Logger.DEBUG))
Index: SendFinished.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/request/SendFinished.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SendFinished.java 6 Sep 2003 01:50:31 -0000 1.4
+++ SendFinished.java 8 Sep 2003 17:03:04 -0000 1.5
@@ -6,6 +6,7 @@
import freenet.node.Node;
import freenet.node.State;
import freenet.CommunicationException;
+import java.io.OutputStream;
/** Message Object for async send callback
* @see RequestSendCallback */
@@ -17,6 +18,15 @@
private boolean succeeded;
final Node n;
final String logMessage;
+ private OutputStream os;
+
+ public void setTrailerStream(OutputStream os) {
+ this.os = os;
+ }
+
+ public OutputStream getOutputStream() {
+ return os;
+ }
public SendFinished(Node n, long id, String logMessage) {
super(id, true);
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
