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

[t...@freenetproject.org]

Author: toad
Date: 2008-03-11 00:15:26 +0000 (Tue, 11 Mar 2008)
New Revision: 18448

Modified:
   trunk/freenet/src/freenet/node/FNPPacketMangler.java
Log:
Slightly more accurate alreadyReportedBytes.

Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java        2008-03-10 
23:59:42 UTC (rev 18447)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java        2008-03-11 
00:15:26 UTC (rev 18448)
@@ -2135,7 +2135,6 @@
                                                        int totalMessageSize = 
0;
                                                        for(int 
j=lastIndex;j<i;j++) totalMessageSize += messageData[j].length;
                                                        int overhead = size - 
totalMessageSize;
-                                                       alreadyReportedBytes = 
0;
                                                        for(int 
j=lastIndex;j<i;j++) {
                                                                MessageItem mi 
= newMsgs[j];
                                                                mi_name = 
(mi.msg == null ? "(not a Message)" : mi.msg.getSpec().getName());
@@ -2162,8 +2161,10 @@
                                                }
                                        }
                                        lastIndex = i;
-                                       if(i != messageData.length)
+                                       if(i != messageData.length) {
                                                length = 1 + 
(messageData[i].length + 2);
+                                               alreadyReportedBytes = 
alreadyReported[i];
+                                       }
                                        count = 0;
                                } else {
                                        length = newLength;
@@ -2184,7 +2185,7 @@
         */
        private int innerProcessOutgoing(byte[][] messageData, int start, int 
length, int bufferLength, 
                        PeerNode pn, boolean neverWaitForPacketNumber, 
AsyncMessageCallback[] callbacks, int alreadyReportedBytes, short priority) 
throws NotConnectedException, WouldBlockException, PacketSequenceException {
-               if(logMINOR) Logger.minor(this, 
"innerProcessOutgoing(...,"+start+ ',' +length+ ',' +bufferLength+ 
','+callbacks.length+')');
+               if(logMINOR) Logger.minor(this, 
"innerProcessOutgoing(...,"+start+ ',' +length+ ',' +bufferLength+ 
','+callbacks.length+','+alreadyReportedBytes+')');
                byte[] buf = new byte[bufferLength];
                buf[0] = (byte)length;
                int loc = 1;