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

[t...@freenetproject.org]

Author: toad
Date: 2008-09-23 19:09:32 +0000 (Tue, 23 Sep 2008)
New Revision: 22781

Modified:
   trunk/freenet/src/freenet/node/PeerMessageQueue.java
Log:
Add the 2 bytes overhead for thisSize


Modified: trunk/freenet/src/freenet/node/PeerMessageQueue.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerMessageQueue.java        2008-09-23 
19:08:07 UTC (rev 22780)
+++ trunk/freenet/src/freenet/node/PeerMessageQueue.java        2008-09-23 
19:09:32 UTC (rev 22781)
@@ -137,10 +137,10 @@
                                        if(item.submitted + 
PacketSender.MAX_COALESCING_DELAY <= now) {
                                                foundNothingUrgent = false;
                                                int thisSize = item.getLength();
-                                               if(size + thisSize > maxSize) {
+                                               if(size + 2 + thisSize > 
maxSize) {
                                                        if(size == minSize) {
                                                                // Send it 
anyway, nothing else to send.
-                                                               size += 
thisSize;
+                                                               size += 2 + 
thisSize;
                                                                
items.removeFirst();
                                                                
messages.add(item);
                                                                gotEnough = 
true;
@@ -149,7 +149,7 @@
                                                        gotEnough = true;
                                                        break; // More items 
won't fit.
                                                }
-                                               size += thisSize;
+                                               size += 2 + thisSize;
                                                items.removeFirst();
                                                messages.add(item);
                                        } else {
@@ -187,10 +187,10 @@
                                        MessageItem item = (MessageItem) 
items.getFirst();
                                        foundNothing = false;
                                        int thisSize = item.getLength();
-                                       if(size + thisSize > maxSize) {
+                                       if(size + 2 + thisSize > maxSize) {
                                                if(size == minSize) {
                                                        // Send it anyway, 
nothing else to send.
-                                                       size += thisSize;
+                                                       size += 2 + thisSize;
                                                        items.removeFirst();
                                                        messages.add(item);
                                                        gotEnough = true;
@@ -199,7 +199,7 @@
                                                gotEnough = true;
                                                break; // More items won't fit.
                                        }
-                                       size += thisSize;
+                                       size += 2 + thisSize;
                                        items.removeFirst();
                                        messages.add(item);
                                }