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

[t...@freenetproject.org]

Author: toad
Date: 2008-03-06 12:38:56 +0000 (Thu, 06 Mar 2008)
New Revision: 18383

Modified:
   trunk/freenet/src/freenet/node/RequestHandler.java
Log:
Accounting fix, don't doublecount SSK payload, document.

Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java  2008-03-06 12:17:49 UTC 
(rev 18382)
+++ trunk/freenet/src/freenet/node/RequestHandler.java  2008-03-06 12:38:56 UTC 
(rev 18383)
@@ -110,6 +110,7 @@
                                // Can report both parts, because we had both a 
Handler and a Sender
                                
node.nodeStats.successfulSskFetchBytesSentAverage.report(sent);
                                
node.nodeStats.successfulSskFetchBytesReceivedAverage.report(rcvd);
+                               // If rs == null, returnLocalData() will call 
sentPayload.
                         node.sentPayload(rs.getSSKData().length); // won't be 
sentPayload()ed by BlockTransmitter
                         sentPayload(rs.getSSKData().length);
                        }
@@ -578,8 +579,6 @@
                if(block instanceof CHKBlock)
                        return DMT.createFNPCHKDataFound(uid, 
block.getRawHeaders());
                else if(block instanceof SSKBlock) {
-            // FIXME called before payload is actually sent
-                       node.sentPayload(block.getRawData().length); // won't 
be sentPayload()ed by BlockTransmitter
                        return DMT.createFNPSSKDataFound(uid, 
block.getRawHeaders(), block.getRawData());
                } else
                        throw new IllegalStateException("Unknown key block 
type: "+block.getClass());