Update of /cvsroot/freenet/freenet/src/freenet/node/states/data
In directory sc8-pr-cvs1:/tmp/cvs-serv22248/src/freenet/node/states/data
Modified Files:
SendData.java
Log Message:
minor fix
Index: SendData.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/data/SendData.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SendData.java 18 Sep 2003 17:48:11 -0000 1.17
+++ SendData.java 18 Sep 2003 18:02:46 -0000 1.18
@@ -312,6 +312,11 @@
protected void sendWritePadding() throws UnknownTrailerSendIDException,
TrailerSendFinishedException, AlreadySendingTrailerChunkException, IOException {
byte[] stuffToSend;
long remainingPadding = paddingLength - sentPadding;
+ if(logDEBUG)
+ n.logger.log(this, "sendWritePadding(): paddingLength="+
+ paddingLength+"/"+sentPadding+" ("+this+")",
+ Logger.DEBUG);
+ if(remainingPadding <= 0) return; // we will get finished
if(remainingPadding < (Core.blockSize - /*Key.getControlLength()*/ 1)) {
// Last chunk, yay
stuffToSend = new byte[/*Key.getControlLength()*/ 1 +
(int)remainingPadding];
@@ -336,13 +341,17 @@
}
protected State finish() {
- if(!(moved == length || (inPaddingMode && sentPadding == paddingLength) ||
+ if(!(moved == length || (inPaddingMode && sentPadding >= paddingLength) ||
(result != -1))) {
n.logger.log(this, "Not finishing because moved="+moved+"/"+length+
", inPaddingMode="+inPaddingMode+", sentPadding="+sentPadding+
"/"+paddingLength+" ("+this+")", Logger.DEBUG);
return this;
}
+ if(inPaddingMode && sentPadding > paddingLength)
+ n.logger.log(this, "sentPadding="+sentPadding+"/"+
+ paddingLength+" ("+this+")",
+ Logger.NORMAL);
if(result != -1) {
// We were aborted
return handleThrowable(null, false);
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
