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

[toad at freenetproject.org]

Author: toad
Date: 2008-03-01 21:00:56 +0000 (Sat, 01 Mar 2008)
New Revision: 18301

Modified:
   trunk/freenet/src/freenet/node/FNPPacketMangler.java
Log:
Slight improvement to accuracy: formatted messages already have the two bytes per message.

Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java	2008-03-01 20:59:53 UTC (rev 18300)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java	2008-03-01 21:00:56 UTC (rev 18301)
@@ -1992,7 +1992,7 @@
 					int packetNumber = kt.allocateOutgoingPacketNumberNeverBlock();
 					this.processOutgoingPreformatted(buf, 0, buf.length, kt, packetNumber, mi.cb, mi.alreadyReportedBytes, mi.getPriority());
 					//MARK: onSent()
-					mi.onSent(buf.length + fullHeadersLengthOneMessage);
+					mi.onSent(buf.length + fullHeadersLengthMinimum);
 				} catch (NotConnectedException e) {
 					Logger.normal(this, "Caught "+e+" while sending messages ("+mi_name+") to "+pn.getPeer()+requeueLogString);
 					// Requeue
@@ -2558,7 +2558,7 @@
 
 	public void resend(ResendPacketItem item) throws PacketSequenceException, WouldBlockException, KeyChangedException, NotConnectedException {
 		processOutgoingPreformatted(item.buf, 0, item.buf.length, item.kt, item.packetNumber, item.callbacks, 0, item.priority);
-		node.nodeStats.resendByteCounter.sentBytes(item.buf.length + fullHeadersLengthOneMessage);
+		node.nodeStats.resendByteCounter.sentBytes(item.buf.length + fullHeadersLengthMinimum);
 	}
 
 	public int[] supportedNegTypes() {