[freenet-cvs] r7843 - in trunk/freenet/src/freenet: io/comm node

[t...@freenetproject.org]

Author: toad
Date: 2006-01-12 15:51:01 +0000 (Thu, 12 Jan 2006)
New Revision: 7843

Modified:
   trunk/freenet/src/freenet/io/comm/DMT.java
   trunk/freenet/src/freenet/node/RequestHandler.java
   trunk/freenet/src/freenet/node/RequestSender.java
   trunk/freenet/src/freenet/node/Version.java
Log:
342: (mandatory) Fix bug that was causing all CHK data requests to fail (unless 
the data was in the local store).

Modified: trunk/freenet/src/freenet/io/comm/DMT.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/DMT.java  2006-01-12 15:30:35 UTC (rev 
7842)
+++ trunk/freenet/src/freenet/io/comm/DMT.java  2006-01-12 15:51:01 UTC (rev 
7843)
@@ -583,7 +583,7 @@
         return msg;
     }

-    public static final MessageType FNPCHKDataFound = new 
MessageType("FNPDataFound") {{
+    public static final MessageType FNPCHKDataFound = new 
MessageType("FNPCHKDataFound") {{
         addField(UID, Long.class);
         addField(BLOCK_HEADERS, ShortBuffer.class);
     }};

Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java  2006-01-12 15:30:35 UTC 
(rev 7842)
+++ trunk/freenet/src/freenet/node/RequestHandler.java  2006-01-12 15:51:01 UTC 
(rev 7843)
@@ -59,7 +59,7 @@
             KeyBlock block = (KeyBlock) o;
             Message df = createDataFound(block);
             source.send(df);
-            if(block instanceof NodeCHK) {
+            if(block instanceof CHKBlock) {
                PartiallyReceivedBlock prb =
                        new PartiallyReceivedBlock(Node.PACKETS_IN_BLOCK, 
Node.PACKET_SIZE, block.getRawData());
                BlockTransmitter bt =
@@ -122,6 +122,8 @@
                        if(key instanceof NodeSSK) {
                         Message df = DMT.createFNPSSKDataFound(uid, 
rs.getHeaders(), rs.getSSKData());
                         source.send(df);
+                       } else if(!rs.transferStarted()) {
+                               Logger.error(this, "Status is SUCCESS but we 
never started a transfer on "+uid);
                        }
                case RequestSender.TRANSFER_FAILED:
                case RequestSender.VERIFY_FAILURE:

Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java   2006-01-12 15:30:35 UTC 
(rev 7842)
+++ trunk/freenet/src/freenet/node/RequestSender.java   2006-01-12 15:51:01 UTC 
(rev 7843)
@@ -298,7 +298,9 @@
                                BlockReceiver br = new BlockReceiver(node.usm, 
next, uid, prb);

                                try {
+                                       Logger.minor(this, "Receiving data");
                                        byte[] data = br.receive();
+                                       Logger.minor(this, "Received data");
                                        // Received data
                                        CHKBlock block;
                                        try {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-12 15:30:35 UTC (rev 
7842)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-12 15:51:01 UTC (rev 
7843)
@@ -20,10 +20,10 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 341;
+       public static final int buildNumber = 342;

        /** Oldest build of Fred we will talk to */
-       public static final int lastGoodBuild = 340;
+       public static final int lastGoodBuild = 342;

        /** The highest reported build of fred */
        public static int highestSeenBuild = buildNumber;