Author: zothar
Date: 2006-11-05 15:44:25 +0000 (Sun, 05 Nov 2006)
New Revision: 10825

Modified:
   trunk/freenet/src/freenet/io/comm/DMT.java
Log:
indent

Modified: trunk/freenet/src/freenet/io/comm/DMT.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/DMT.java  2006-11-05 14:57:35 UTC (rev 
10824)
+++ trunk/freenet/src/freenet/io/comm/DMT.java  2006-11-05 15:44:25 UTC (rev 
10825)
@@ -64,31 +64,31 @@
        public static final String CHK_HEADER = "chkHeader";
        public static final String FREENET_URI = "freenetURI";
        public static final String FREENET_ROUTING_KEY = "freenetRoutingKey";
-    public static final String TEST_CHK_HEADERS = "testCHKHeaders";
-    public static final String HTL = "hopsToLive";
-    public static final String SUCCESS = "success";
-    public static final String FNP_SOURCE_PEERNODE = "sourcePeerNode";
-    public static final String PING_SEQNO = "pingSequenceNumber";
-    public static final String LOCATION = "location";
-    public static final String NEAREST_LOCATION = "nearestLocation";
-    public static final String BEST_LOCATION = "bestLocation";
-    public static final String TARGET_LOCATION = "targetLocation";
-    public static final String TYPE = "type";
-    public static final String PAYLOAD = "payload";
-    public static final String COUNTER = "counter";
-    public static final String RETURN_LOCATION = "returnLocation";
-    public static final String BLOCK_HEADERS = "blockHeaders";
-    public static final String DATA_INSERT_REJECTED_REASON = 
"dataInsertRejectedReason";
-    public static final String STREAM_SEQNO = "streamSequenceNumber";
-    public static final String IS_LOCAL = "isLocal";
-    public static final String ANY_TIMED_OUT = "anyTimedOut";
-    public static final String PUBKEY_HASH = "pubkeyHash";
-    public static final String NEED_PUB_KEY = "needPubKey";
-    public static final String PUBKEY_AS_BYTES = "pubkeyAsBytes";
-    public static final String SOURCE_NODENAME = "sourceNodename";
-    public static final String TARGET_NODENAME = "targetNodename";
-    public static final String NODE_TO_NODE_MESSAGE_TYPE = 
"nodeToNodeMessageType";
-    public static final String NODE_TO_NODE_MESSAGE_TEXT = 
"nodeToNodeMessageText";
+       public static final String TEST_CHK_HEADERS = "testCHKHeaders";
+       public static final String HTL = "hopsToLive";
+       public static final String SUCCESS = "success";
+       public static final String FNP_SOURCE_PEERNODE = "sourcePeerNode";
+       public static final String PING_SEQNO = "pingSequenceNumber";
+       public static final String LOCATION = "location";
+       public static final String NEAREST_LOCATION = "nearestLocation";
+       public static final String BEST_LOCATION = "bestLocation";
+       public static final String TARGET_LOCATION = "targetLocation";
+       public static final String TYPE = "type";
+       public static final String PAYLOAD = "payload";
+       public static final String COUNTER = "counter";
+       public static final String RETURN_LOCATION = "returnLocation";
+       public static final String BLOCK_HEADERS = "blockHeaders";
+       public static final String DATA_INSERT_REJECTED_REASON = 
"dataInsertRejectedReason";
+       public static final String STREAM_SEQNO = "streamSequenceNumber";
+       public static final String IS_LOCAL = "isLocal";
+       public static final String ANY_TIMED_OUT = "anyTimedOut";
+       public static final String PUBKEY_HASH = "pubkeyHash";
+       public static final String NEED_PUB_KEY = "needPubKey";
+       public static final String PUBKEY_AS_BYTES = "pubkeyAsBytes";
+       public static final String SOURCE_NODENAME = "sourceNodename";
+       public static final String TARGET_NODENAME = "targetNodename";
+       public static final String NODE_TO_NODE_MESSAGE_TYPE = 
"nodeToNodeMessageType";
+       public static final String NODE_TO_NODE_MESSAGE_TEXT = 
"nodeToNodeMessageText";

        //Diagnostic
        public static final MessageType ping = new MessageType("ping") {{
@@ -145,7 +145,7 @@
        }};

        public static final Message createCorruptionNotification(long uid, 
String url, long fileLength, 
-           String lastModified, int chunkNo, boolean isHash) {
+               String lastModified, int chunkNo, boolean isHash) {
                Message msg = new Message(corruptionNotification);
                msg.set(UID, uid);
                msg.set(URL, url);
@@ -224,352 +224,352 @@
        }

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

        public static final Message createTestTransferSend(long uid) {
-           Message msg = new Message(testTransferSend);
-           msg.set(UID, uid);
-           return msg;
+               Message msg = new Message(testTransferSend);
+               msg.set(UID, uid);
+               return msg;
        }

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

        public static final Message createTestTransferSendAck(long uid) {
-           Message msg = new Message(testTransferSendAck);
-           msg.set(UID, uid);
-           return msg;
+               Message msg = new Message(testTransferSendAck);
+               msg.set(UID, uid);
+               return msg;
        }

        public static final MessageType testSendCHK = new 
MessageType("testSendCHK") {{
-           addField(UID, Long.class);
-           addField(FREENET_URI, String.class);
-           addField(CHK_HEADER, Buffer.class);
+               addField(UID, Long.class);
+               addField(FREENET_URI, String.class);
+               addField(CHK_HEADER, Buffer.class);
        }};

-    public static final Message createTestSendCHK(long uid, String uri, Buffer 
header) {
-        Message msg = new Message(testSendCHK);
-        msg.set(UID, uid);
-        msg.set(FREENET_URI, uri);
-        msg.set(CHK_HEADER, header);
-        return msg;
-    }
+       public static final Message createTestSendCHK(long uid, String uri, 
Buffer header) {
+               Message msg = new Message(testSendCHK);
+               msg.set(UID, uid);
+               msg.set(FREENET_URI, uri);
+               msg.set(CHK_HEADER, header);
+               return msg;
+       }

-    public static final MessageType testRequest = new 
MessageType("testRequest") {{
-        addField(UID, Long.class);
-        addField(FREENET_ROUTING_KEY, Key.class);
-        addField(HTL, Integer.class);
-    }};
-    
-    public static final Message createTestRequest(Key Key, long id, int htl) {
-        Message msg = new Message(testRequest);
-        msg.set(UID, id);
-        msg.set(FREENET_ROUTING_KEY, Key);
-        msg.set(HTL, htl);
-        return msg;
-    }
+       public static final MessageType testRequest = new 
MessageType("testRequest") {{
+               addField(UID, Long.class);
+               addField(FREENET_ROUTING_KEY, Key.class);
+               addField(HTL, Integer.class);
+       }};
+       
+       public static final Message createTestRequest(Key Key, long id, int 
htl) {
+               Message msg = new Message(testRequest);
+               msg.set(UID, id);
+               msg.set(FREENET_ROUTING_KEY, Key);
+               msg.set(HTL, htl);
+               return msg;
+       }

-    public static final MessageType testDataNotFound = new 
MessageType("testDataNotFound") {{
-        addField(UID, Long.class);
-    }};
-    
-    public static final Message createTestDataNotFound(long uid) {
-        Message msg = new Message(testDataNotFound);
-        msg.set(UID, uid);
-        return msg;
-    }
-    
-    public static final MessageType testDataReply = new 
MessageType("testDataReply") {{
-        addField(UID, Long.class);
-        addField(TEST_CHK_HEADERS, Buffer.class);
-    }};
-    
-    public static final Message createTestDataReply(long uid, byte[] headers) {
-        Message msg = new Message(testDataReply);
-        msg.set(UID, uid);
-        msg.set(TEST_CHK_HEADERS, new Buffer(headers));
-        return msg;
-    }
-    
-    public static final MessageType testSendCHKAck = new 
MessageType("testSendCHKAck") {{
-        addField(UID, Long.class);
-        addField(FREENET_URI, String.class);
-    }};
-    public static final Message createTestSendCHKAck(long uid, String key) {
-        Message msg = new Message(testSendCHKAck);
-        msg.set(UID, uid);
-        msg.set(FREENET_URI, key);
-        return msg;
-    }
-    
+       public static final MessageType testDataNotFound = new 
MessageType("testDataNotFound") {{
+               addField(UID, Long.class);
+       }};
+       
+       public static final Message createTestDataNotFound(long uid) {
+               Message msg = new Message(testDataNotFound);
+               msg.set(UID, uid);
+               return msg;
+       }
+       
+       public static final MessageType testDataReply = new 
MessageType("testDataReply") {{
+               addField(UID, Long.class);
+               addField(TEST_CHK_HEADERS, Buffer.class);
+       }};
+       
+       public static final Message createTestDataReply(long uid, byte[] 
headers) {
+               Message msg = new Message(testDataReply);
+               msg.set(UID, uid);
+               msg.set(TEST_CHK_HEADERS, new Buffer(headers));
+               return msg;
+       }
+       
+       public static final MessageType testSendCHKAck = new 
MessageType("testSendCHKAck") {{
+               addField(UID, Long.class);
+               addField(FREENET_URI, String.class);
+       }};
+       public static final Message createTestSendCHKAck(long uid, String key) {
+               Message msg = new Message(testSendCHKAck);
+               msg.set(UID, uid);
+               msg.set(FREENET_URI, key);
+               return msg;
+       }
+       
        public static final MessageType testDataReplyAck = new 
MessageType("testDataReplyAck") {{
-           addField(UID, Long.class);
+               addField(UID, Long.class);
        }};

-    public static final Message createTestDataReplyAck(long id) {
-        Message msg = new Message(testDataReplyAck);
-        msg.set(UID, id);
-        return msg;
-    }
+       public static final Message createTestDataReplyAck(long id) {
+               Message msg = new Message(testDataReplyAck);
+               msg.set(UID, id);
+               return msg;
+       }

-    public static final MessageType testDataNotFoundAck = new 
MessageType("testDataNotFoundAck") {{
-        addField(UID, Long.class);
-    }};
-    public static final Message createTestDataNotFoundAck(long id) {
-        Message msg = new Message(testDataNotFoundAck);
-        msg.set(UID, id);
-        return msg;
-    }
-    
-    // Internal only messages
-    
-    public static final MessageType testReceiveCompleted = new 
MessageType("testReceiveCompleted", true) {{
-        addField(UID, Long.class);
-        addField(SUCCESS, Boolean.class);
-        addField(REASON, String.class);
-    }};
-    
-    public static final Message createTestReceiveCompleted(long id, boolean 
success, String reason) {
-        Message msg = new Message(testReceiveCompleted);
-        msg.set(UID, id);
-        msg.set(SUCCESS, success);
-        msg.set(REASON, reason);
-        return msg;
-    }
-    
-    public static final MessageType testSendCompleted = new 
MessageType("testSendCompleted", true) {{
-        addField(UID, Long.class);
-        addField(SUCCESS, Boolean.class);
-        addField(REASON, String.class);
-    }};
+       public static final MessageType testDataNotFoundAck = new 
MessageType("testDataNotFoundAck") {{
+               addField(UID, Long.class);
+       }};
+       public static final Message createTestDataNotFoundAck(long id) {
+               Message msg = new Message(testDataNotFoundAck);
+               msg.set(UID, id);
+               return msg;
+       }
+       
+       // Internal only messages
+       
+       public static final MessageType testReceiveCompleted = new 
MessageType("testReceiveCompleted", true) {{
+               addField(UID, Long.class);
+               addField(SUCCESS, Boolean.class);
+               addField(REASON, String.class);
+       }};
+       
+       public static final Message createTestReceiveCompleted(long id, boolean 
success, String reason) {
+               Message msg = new Message(testReceiveCompleted);
+               msg.set(UID, id);
+               msg.set(SUCCESS, success);
+               msg.set(REASON, reason);
+               return msg;
+       }
+       
+       public static final MessageType testSendCompleted = new 
MessageType("testSendCompleted", true) {{
+               addField(UID, Long.class);
+               addField(SUCCESS, Boolean.class);
+               addField(REASON, String.class);
+       }};

-    public static final Message createTestSendCompleted(long id, boolean 
success, String reason) {
-        Message msg = new Message(testSendCompleted);
-        msg.set(UID, id);
-        msg.set(SUCCESS, success);
-        msg.set(REASON, reason);
-        return msg;
-    }
+       public static final Message createTestSendCompleted(long id, boolean 
success, String reason) {
+               Message msg = new Message(testSendCompleted);
+               msg.set(UID, id);
+               msg.set(SUCCESS, success);
+               msg.set(REASON, reason);
+               return msg;
+       }

-    // Node-To-Node Instant Message
-    public static final MessageType nodeToNodeTextMessage = new 
MessageType("nodeToNodeTextMessage", false) {{
-        addField(NODE_TO_NODE_MESSAGE_TYPE, Integer.class);
-        addField(SOURCE_NODENAME, String.class);
-        addField(TARGET_NODENAME, String.class);
-        addField(NODE_TO_NODE_MESSAGE_TEXT, String.class);
-    }};
+       // Node-To-Node Instant Message
+       public static final MessageType nodeToNodeTextMessage = new 
MessageType("nodeToNodeTextMessage", false) {{
+               addField(NODE_TO_NODE_MESSAGE_TYPE, Integer.class);
+               addField(SOURCE_NODENAME, String.class);
+               addField(TARGET_NODENAME, String.class);
+               addField(NODE_TO_NODE_MESSAGE_TEXT, String.class);
+       }};

-    public static final Message createNodeToNodeTextMessage(int type, String 
source, String target, String message) {
-        Message msg = new Message(nodeToNodeTextMessage);
-        msg.set(NODE_TO_NODE_MESSAGE_TYPE, type);
-        msg.set(SOURCE_NODENAME, source);
-        msg.set(TARGET_NODENAME, target);
-        msg.set(NODE_TO_NODE_MESSAGE_TEXT, message);
-        return msg;
-    }
+       public static final Message createNodeToNodeTextMessage(int type, 
String source, String target, String message) {
+               Message msg = new Message(nodeToNodeTextMessage);
+               msg.set(NODE_TO_NODE_MESSAGE_TYPE, type);
+               msg.set(SOURCE_NODENAME, source);
+               msg.set(TARGET_NODENAME, target);
+               msg.set(NODE_TO_NODE_MESSAGE_TEXT, message);
+               return msg;
+       }

-    // FNP messages
-    public static final MessageType FNPCHKDataRequest = new 
MessageType("FNPCHKDataRequest") {{
-        addField(UID, Long.class);
-        addField(HTL, Short.class);
-        addField(NEAREST_LOCATION, Double.class);
-        addField(FREENET_ROUTING_KEY, NodeCHK.class);
-    }};
-    
-    public static final Message createFNPCHKDataRequest(long id, short htl, 
NodeCHK key, double nearestLocation) {
-        Message msg = new Message(FNPCHKDataRequest);
-        msg.set(UID, id);
-        msg.set(HTL, htl);
-        msg.set(FREENET_ROUTING_KEY, key);
-        msg.set(NEAREST_LOCATION, nearestLocation);
-        return msg;
-    }
-    
-    public static final MessageType FNPSSKDataRequest = new 
MessageType("FNPSSKDataRequest") {{
-        addField(UID, Long.class);
-        addField(HTL, Short.class);
-        addField(NEAREST_LOCATION, Double.class);
-        addField(FREENET_ROUTING_KEY, NodeSSK.class);
-       addField(NEED_PUB_KEY, Boolean.class);
-    }};
-    
-    public static final Message createFNPSSKDataRequest(long id, short htl, 
NodeSSK key, double nearestLocation, boolean needPubKey) {
-        Message msg = new Message(FNPSSKDataRequest);
-        msg.set(UID, id);
-        msg.set(HTL, htl);
-        msg.set(FREENET_ROUTING_KEY, key);
-        msg.set(NEAREST_LOCATION, nearestLocation);
-        msg.set(NEED_PUB_KEY, needPubKey);
-        return msg;
-    }
-    
-    // Hit our tail, try a different node.
-    public static final MessageType FNPRejectedLoop = new 
MessageType("FNPRejectLoop") {{
-        addField(UID, Long.class);
-    }};
-    
-    public static final Message createFNPRejectedLoop(long id) {
-        Message msg = new Message(FNPRejectedLoop);
-        msg.set(UID, id);
-        return msg;
-    }
-    
-    // Too many requests for present capacity. Fail, propagate back
-    // to source, and reduce send rate.
-    public static final MessageType FNPRejectedOverload = new 
MessageType("FNPRejectOverload") {{
-        addField(UID, Long.class);
-        addField(IS_LOCAL, Boolean.class);
-    }};
-    
-    public static final Message createFNPRejectedOverload(long id, boolean 
isLocal) {
-        Message msg = new Message(FNPRejectedOverload);
-        msg.set(UID, id);
-        msg.set(IS_LOCAL, isLocal);
-        return msg;
-    }
-    
-    public static final MessageType FNPAccepted = new 
MessageType("FNPAccepted") {{
-        addField(UID, Long.class);
-    }};
-    
-    public static final Message createFNPAccepted(long id) {
-        Message msg = new Message(FNPAccepted);
-        msg.set(UID, id);
-        return msg;
-    }
-    
-    public static final MessageType FNPDataNotFound = new 
MessageType("FNPDataNotFound") {{
-        addField(UID, Long.class);
-    }};
-    
-    public static final Message createFNPDataNotFound(long id) {
-        Message msg = new Message(FNPDataNotFound);
-        msg.set(UID, id);
-        return msg;
-    }
-    
-    public static final MessageType FNPCHKDataFound = new 
MessageType("FNPCHKDataFound") {{
-        addField(UID, Long.class);
-        addField(BLOCK_HEADERS, ShortBuffer.class);
-    }};
-    
-    public static final Message createFNPCHKDataFound(long id, byte[] buf) {
-        Message msg = new Message(FNPCHKDataFound);
-        msg.set(UID, id);
-        msg.set(BLOCK_HEADERS, new ShortBuffer(buf));
-        return msg;
-    }
-    
-    public static final MessageType FNPRouteNotFound = new 
MessageType("FNPRouteNotFound") {{
-        addField(UID, Long.class);
-        addField(HTL, Short.class);
-    }};
-    
-    public static final Message createFNPRouteNotFound(long id, short htl) {
-        Message msg = new Message(FNPRouteNotFound);
-        msg.set(UID, id);
-        msg.set(HTL, htl);
-        return msg;
-    }
-    
-    public static final MessageType FNPInsertRequest = new 
MessageType("FNPInsertRequest") {{
-        addField(UID, Long.class);
-        addField(HTL, Short.class);
-        addField(NEAREST_LOCATION, Double.class);
-        addField(FREENET_ROUTING_KEY, Key.class);
-    }};
-    
-    public static final Message createFNPInsertRequest(long id, short htl, Key 
key, double nearestLoc) {
-        Message msg = new Message(FNPInsertRequest);
-        msg.set(UID, id);
-        msg.set(HTL, htl);
-        msg.set(FREENET_ROUTING_KEY, key);
-        msg.set(NEAREST_LOCATION, nearestLoc);
-        return msg;
-    }
-    
-    public static final MessageType FNPInsertReply = new 
MessageType("FNPInsertReply") {{
-        addField(UID, Long.class);
-    }};
-    
-    public static final Message createFNPInsertReply(long id) {
-        Message msg = new Message(FNPInsertReply);
-        msg.set(UID, id);
-        return msg;
-    }
-    
-    public static final MessageType FNPDataInsert = new 
MessageType("FNPDataInsert") {{
-        addField(UID, Long.class);
-        addField(BLOCK_HEADERS, ShortBuffer.class);
-    }};
-    
-    public static final Message createFNPDataInsert(long uid, byte[] headers) {
-        Message msg = new Message(FNPDataInsert);
-        msg.set(UID, uid);
-        msg.set(BLOCK_HEADERS, new ShortBuffer(headers));
-        return msg;
-    }
+       // FNP messages
+       public static final MessageType FNPCHKDataRequest = new 
MessageType("FNPCHKDataRequest") {{
+               addField(UID, Long.class);
+               addField(HTL, Short.class);
+               addField(NEAREST_LOCATION, Double.class);
+               addField(FREENET_ROUTING_KEY, NodeCHK.class);
+       }};
+       
+       public static final Message createFNPCHKDataRequest(long id, short htl, 
NodeCHK key, double nearestLocation) {
+               Message msg = new Message(FNPCHKDataRequest);
+               msg.set(UID, id);
+               msg.set(HTL, htl);
+               msg.set(FREENET_ROUTING_KEY, key);
+               msg.set(NEAREST_LOCATION, nearestLocation);
+               return msg;
+       }
+       
+       public static final MessageType FNPSSKDataRequest = new 
MessageType("FNPSSKDataRequest") {{
+               addField(UID, Long.class);
+               addField(HTL, Short.class);
+               addField(NEAREST_LOCATION, Double.class);
+               addField(FREENET_ROUTING_KEY, NodeSSK.class);
+               addField(NEED_PUB_KEY, Boolean.class);
+       }};
+       
+       public static final Message createFNPSSKDataRequest(long id, short htl, 
NodeSSK key, double nearestLocation, boolean needPubKey) {
+               Message msg = new Message(FNPSSKDataRequest);
+               msg.set(UID, id);
+               msg.set(HTL, htl);
+               msg.set(FREENET_ROUTING_KEY, key);
+               msg.set(NEAREST_LOCATION, nearestLocation);
+               msg.set(NEED_PUB_KEY, needPubKey);
+               return msg;
+       }
+       
+       // Hit our tail, try a different node.
+       public static final MessageType FNPRejectedLoop = new 
MessageType("FNPRejectLoop") {{
+               addField(UID, Long.class);
+       }};
+       
+       public static final Message createFNPRejectedLoop(long id) {
+               Message msg = new Message(FNPRejectedLoop);
+               msg.set(UID, id);
+               return msg;
+       }
+       
+       // Too many requests for present capacity. Fail, propagate back
+       // to source, and reduce send rate.
+       public static final MessageType FNPRejectedOverload = new 
MessageType("FNPRejectOverload") {{
+               addField(UID, Long.class);
+               addField(IS_LOCAL, Boolean.class);
+       }};
+       
+       public static final Message createFNPRejectedOverload(long id, boolean 
isLocal) {
+               Message msg = new Message(FNPRejectedOverload);
+               msg.set(UID, id);
+               msg.set(IS_LOCAL, isLocal);
+               return msg;
+       }
+       
+       public static final MessageType FNPAccepted = new 
MessageType("FNPAccepted") {{
+               addField(UID, Long.class);
+       }};
+       
+       public static final Message createFNPAccepted(long id) {
+               Message msg = new Message(FNPAccepted);
+               msg.set(UID, id);
+               return msg;
+       }
+       
+       public static final MessageType FNPDataNotFound = new 
MessageType("FNPDataNotFound") {{
+               addField(UID, Long.class);
+       }};
+       
+       public static final Message createFNPDataNotFound(long id) {
+               Message msg = new Message(FNPDataNotFound);
+               msg.set(UID, id);
+               return msg;
+       }
+       
+       public static final MessageType FNPCHKDataFound = new 
MessageType("FNPCHKDataFound") {{
+               addField(UID, Long.class);
+               addField(BLOCK_HEADERS, ShortBuffer.class);
+       }};
+       
+       public static final Message createFNPCHKDataFound(long id, byte[] buf) {
+               Message msg = new Message(FNPCHKDataFound);
+               msg.set(UID, id);
+               msg.set(BLOCK_HEADERS, new ShortBuffer(buf));
+               return msg;
+       }
+       
+       public static final MessageType FNPRouteNotFound = new 
MessageType("FNPRouteNotFound") {{
+               addField(UID, Long.class);
+               addField(HTL, Short.class);
+       }};
+       
+       public static final Message createFNPRouteNotFound(long id, short htl) {
+               Message msg = new Message(FNPRouteNotFound);
+               msg.set(UID, id);
+               msg.set(HTL, htl);
+               return msg;
+       }
+       
+       public static final MessageType FNPInsertRequest = new 
MessageType("FNPInsertRequest") {{
+               addField(UID, Long.class);
+               addField(HTL, Short.class);
+               addField(NEAREST_LOCATION, Double.class);
+               addField(FREENET_ROUTING_KEY, Key.class);
+       }};
+       
+       public static final Message createFNPInsertRequest(long id, short htl, 
Key key, double nearestLoc) {
+               Message msg = new Message(FNPInsertRequest);
+               msg.set(UID, id);
+               msg.set(HTL, htl);
+               msg.set(FREENET_ROUTING_KEY, key);
+               msg.set(NEAREST_LOCATION, nearestLoc);
+               return msg;
+       }
+       
+       public static final MessageType FNPInsertReply = new 
MessageType("FNPInsertReply") {{
+               addField(UID, Long.class);
+       }};
+       
+       public static final Message createFNPInsertReply(long id) {
+               Message msg = new Message(FNPInsertReply);
+               msg.set(UID, id);
+               return msg;
+       }
+       
+       public static final MessageType FNPDataInsert = new 
MessageType("FNPDataInsert") {{
+               addField(UID, Long.class);
+               addField(BLOCK_HEADERS, ShortBuffer.class);
+       }};
+       
+       public static final Message createFNPDataInsert(long uid, byte[] 
headers) {
+               Message msg = new Message(FNPDataInsert);
+               msg.set(UID, uid);
+               msg.set(BLOCK_HEADERS, new ShortBuffer(headers));
+               return msg;
+       }

-    public static final MessageType FNPInsertTransfersCompleted = new 
MessageType("FNPInsertTransfersCompleted") {{
-       addField(UID, Long.class);
-       addField(ANY_TIMED_OUT, Boolean.class);
-    }};
+       public static final MessageType FNPInsertTransfersCompleted = new 
MessageType("FNPInsertTransfersCompleted") {{
+               addField(UID, Long.class);
+               addField(ANY_TIMED_OUT, Boolean.class);
+       }};

-    public static final Message createFNPInsertTransfersCompleted(long uid, 
boolean anyTimedOut) {
-       Message msg = new Message(FNPInsertTransfersCompleted);
-       msg.set(UID, uid);
-       msg.set(ANY_TIMED_OUT, anyTimedOut);
-       return msg;
-    }
-    
-    public static final MessageType FNPRejectedTimeout = new 
MessageType("FNPTooSlow") {{
-        addField(UID, Long.class);
-    }};
-    
-    public static final Message createFNPRejectedTimeout(long uid) {
-        Message msg = new Message(FNPRejectedTimeout);
-        msg.set(UID, uid);
-        return msg;
-    }
-    
-    public static final MessageType FNPDataInsertRejected = new 
MessageType("FNPDataInsertRejected") {{
-        addField(UID, Long.class);
-        addField(DATA_INSERT_REJECTED_REASON, Short.class);
-    }};
-    
-    public static final Message createFNPDataInsertRejected(long uid, short 
reason) {
-        Message msg = new Message(FNPDataInsertRejected);
-        msg.set(UID, uid);
-        msg.set(DATA_INSERT_REJECTED_REASON, reason);
-        return msg;
-    }
+       public static final Message createFNPInsertTransfersCompleted(long uid, 
boolean anyTimedOut) {
+               Message msg = new Message(FNPInsertTransfersCompleted);
+               msg.set(UID, uid);
+               msg.set(ANY_TIMED_OUT, anyTimedOut);
+               return msg;
+       }
+       
+       public static final MessageType FNPRejectedTimeout = new 
MessageType("FNPTooSlow") {{
+               addField(UID, Long.class);
+       }};
+       
+       public static final Message createFNPRejectedTimeout(long uid) {
+               Message msg = new Message(FNPRejectedTimeout);
+               msg.set(UID, uid);
+               return msg;
+       }
+       
+       public static final MessageType FNPDataInsertRejected = new 
MessageType("FNPDataInsertRejected") {{
+               addField(UID, Long.class);
+               addField(DATA_INSERT_REJECTED_REASON, Short.class);
+       }};
+       
+       public static final Message createFNPDataInsertRejected(long uid, short 
reason) {
+               Message msg = new Message(FNPDataInsertRejected);
+               msg.set(UID, uid);
+               msg.set(DATA_INSERT_REJECTED_REASON, reason);
+               return msg;
+       }

-    public static final short DATA_INSERT_REJECTED_VERIFY_FAILED = 1;
-    public static final short DATA_INSERT_REJECTED_RECEIVE_FAILED = 2;
-    public static final short DATA_INSERT_REJECTED_SSK_ERROR = 3;
-    
-    public static final String getDataInsertRejectedReason(short reason) {
-        if(reason == DATA_INSERT_REJECTED_VERIFY_FAILED)
-            return "Verify failed";
-        else if(reason == DATA_INSERT_REJECTED_RECEIVE_FAILED)
-            return "Receive failed";
-        else if(reason == DATA_INSERT_REJECTED_SSK_ERROR)
-               return "SSK error";
-        return "Unknown reason code: "+reason;
-    }
+       public static final short DATA_INSERT_REJECTED_VERIFY_FAILED = 1;
+       public static final short DATA_INSERT_REJECTED_RECEIVE_FAILED = 2;
+       public static final short DATA_INSERT_REJECTED_SSK_ERROR = 3;
+       
+       public static final String getDataInsertRejectedReason(short reason) {
+               if(reason == DATA_INSERT_REJECTED_VERIFY_FAILED)
+                       return "Verify failed";
+               else if(reason == DATA_INSERT_REJECTED_RECEIVE_FAILED)
+                       return "Receive failed";
+               else if(reason == DATA_INSERT_REJECTED_SSK_ERROR)
+                       return "SSK error";
+               return "Unknown reason code: "+reason;
+       }

-    public static final MessageType FNPSSKInsertRequest = new 
MessageType("FNPSSKInsertRequest") {{
-       addField(UID, Long.class);
-       addField(HTL, Short.class);
-       addField(FREENET_ROUTING_KEY, NodeSSK.class);
-        addField(NEAREST_LOCATION, Double.class);
-        addField(BLOCK_HEADERS, ShortBuffer.class);
-        addField(PUBKEY_HASH, ShortBuffer.class);
-        addField(DATA, ShortBuffer.class);
-    }};
-    
+       public static final MessageType FNPSSKInsertRequest = new 
MessageType("FNPSSKInsertRequest") {{
+               addField(UID, Long.class);
+               addField(HTL, Short.class);
+               addField(FREENET_ROUTING_KEY, NodeSSK.class);
+               addField(NEAREST_LOCATION, Double.class);
+               addField(BLOCK_HEADERS, ShortBuffer.class);
+               addField(PUBKEY_HASH, ShortBuffer.class);
+               addField(DATA, ShortBuffer.class);
+       }};
+       
        public static Message createFNPSSKInsertRequest(long uid, short htl, 
NodeSSK myKey, double closestLocation, byte[] headers, byte[] data, byte[] 
pubKeyHash) {
                Message msg = new Message(FNPSSKInsertRequest);
                msg.set(UID, uid);
@@ -583,9 +583,9 @@
        }

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

        public static Message createFNPSSKDataFound(long uid, byte[] headers, 
byte[] data) {
@@ -630,237 +630,237 @@
                return msg;
        }

-    public static final MessageType FNPPing = new MessageType("FNPPing") {{
-        addField(PING_SEQNO, Integer.class);
-    }};
-    
-    public static final Message createFNPPing(int seqNo) {
-        Message msg = new Message(FNPPing);
-        msg.set(PING_SEQNO, seqNo);
-        return msg;
-    }
+       public static final MessageType FNPPing = new MessageType("FNPPing") {{
+               addField(PING_SEQNO, Integer.class);
+       }};
+       
+       public static final Message createFNPPing(int seqNo) {
+               Message msg = new Message(FNPPing);
+               msg.set(PING_SEQNO, seqNo);
+               return msg;
+       }

-    public static final MessageType FNPLinkPing = new 
MessageType("FNPLinkPing") {{
-       addField(PING_SEQNO, Long.class);
-    }};
-    
-    public static final Message createFNPLinkPing(long seqNo) {
-       Message msg = new Message(FNPLinkPing);
-       msg.set(PING_SEQNO, seqNo);
-       return msg;
-    }
-    
-    public static final MessageType FNPLinkPong = new 
MessageType("FNPLinkPong") {{
-       addField(PING_SEQNO, Long.class);
-    }};
-    
-    public static final Message createFNPLinkPong(long seqNo) {
-       Message msg = new Message(FNPLinkPong);
-       msg.set(PING_SEQNO, seqNo);
-       return msg;
-    }
-    
-    public static final MessageType FNPPong = new MessageType("FNPPong") {{
-        addField(PING_SEQNO, Integer.class);
-    }};
-    
-    public static final Message createFNPPong(int seqNo) {
-        Message msg = new Message(FNPPong);
-        msg.set(PING_SEQNO, seqNo);
-        return msg;
-    }
-    
-    public static final MessageType FNPProbeRequest = new 
MessageType("FNPProbeRequest") {{
-       addField(UID, Long.class);
-       addField(TARGET_LOCATION, Double.class);
-       addField(NEAREST_LOCATION, Double.class);
-       addField(BEST_LOCATION, Double.class);
-       addField(HTL, Short.class);
-       addField(COUNTER, Short.class);
-    }};
-    
-    public static final Message createFNPProbeRequest(long uid, double target, 
double nearest, 
-               double best, short htl, short counter) {
-       Message msg = new Message(FNPProbeRequest);
-       msg.set(UID, uid);
-       msg.set(TARGET_LOCATION, target);
-       msg.set(NEAREST_LOCATION, nearest);
-       msg.set(BEST_LOCATION, best);
-       msg.set(HTL, htl);
-       msg.set(COUNTER, counter);
-       return msg;
-    }
+       public static final MessageType FNPLinkPing = new 
MessageType("FNPLinkPing") {{
+               addField(PING_SEQNO, Long.class);
+       }};
+       
+       public static final Message createFNPLinkPing(long seqNo) {
+               Message msg = new Message(FNPLinkPing);
+               msg.set(PING_SEQNO, seqNo);
+               return msg;
+       }
+       
+       public static final MessageType FNPLinkPong = new 
MessageType("FNPLinkPong") {{
+               addField(PING_SEQNO, Long.class);
+       }};
+       
+       public static final Message createFNPLinkPong(long seqNo) {
+               Message msg = new Message(FNPLinkPong);
+               msg.set(PING_SEQNO, seqNo);
+               return msg;
+       }
+       
+       public static final MessageType FNPPong = new MessageType("FNPPong") {{
+               addField(PING_SEQNO, Integer.class);
+       }};
+       
+       public static final Message createFNPPong(int seqNo) {
+               Message msg = new Message(FNPPong);
+               msg.set(PING_SEQNO, seqNo);
+               return msg;
+       }
+       
+       public static final MessageType FNPProbeRequest = new 
MessageType("FNPProbeRequest") {{
+               addField(UID, Long.class);
+               addField(TARGET_LOCATION, Double.class);
+               addField(NEAREST_LOCATION, Double.class);
+               addField(BEST_LOCATION, Double.class);
+               addField(HTL, Short.class);
+               addField(COUNTER, Short.class);
+       }};
+       
+       public static final Message createFNPProbeRequest(long uid, double 
target, double nearest, 
+                       double best, short htl, short counter) {
+               Message msg = new Message(FNPProbeRequest);
+               msg.set(UID, uid);
+               msg.set(TARGET_LOCATION, target);
+               msg.set(NEAREST_LOCATION, nearest);
+               msg.set(BEST_LOCATION, best);
+               msg.set(HTL, htl);
+               msg.set(COUNTER, counter);
+               return msg;
+       }

-    public static final MessageType FNPProbeReply = new 
MessageType("FNPProbeReply") {{
-       addField(UID, Long.class);
-       addField(TARGET_LOCATION, Double.class);
-       addField(NEAREST_LOCATION, Double.class);
-       addField(BEST_LOCATION, Double.class);
-       addField(COUNTER, Short.class);
-    }};
-    
-    public static final Message createFNPProbeReply(long uid, double target, 
double nearest, 
-               double best, short counter) {
-       Message msg = new Message(FNPProbeReply);
-       msg.set(UID, uid);
-       msg.set(TARGET_LOCATION, target);
-       msg.set(NEAREST_LOCATION, nearest);
-       msg.set(BEST_LOCATION, best);
-       msg.set(COUNTER, counter);
-       return msg;
-    }
-    
-    public static final MessageType FNPProbeRejected = new 
MessageType("FNPProbeRejected") {{
-       addField(UID, Long.class);
-       addField(TARGET_LOCATION, Double.class);
-       addField(NEAREST_LOCATION, Double.class);
-       addField(BEST_LOCATION, Double.class);
-       addField(HTL, Short.class);
-       addField(COUNTER, Short.class);
-       addField(REASON, Short.class);
-    }};
-    
-    public static final Message createFNPProbeRejected(long uid, double 
target, double nearest, 
-               double best, short counter, short htl, short reason) {
-       Message msg = new Message(FNPProbeRejected);
-       msg.set(UID, uid);
-       msg.set(TARGET_LOCATION, target);
-       msg.set(NEAREST_LOCATION, nearest);
-       msg.set(BEST_LOCATION, best);
-       msg.set(HTL, htl);
-       msg.set(COUNTER, counter);
-       msg.set(REASON, reason);
-       return msg;
-    }
+       public static final MessageType FNPProbeReply = new 
MessageType("FNPProbeReply") {{
+               addField(UID, Long.class);
+               addField(TARGET_LOCATION, Double.class);
+               addField(NEAREST_LOCATION, Double.class);
+               addField(BEST_LOCATION, Double.class);
+               addField(COUNTER, Short.class);
+       }};
+       
+       public static final Message createFNPProbeReply(long uid, double 
target, double nearest, 
+                       double best, short counter) {
+               Message msg = new Message(FNPProbeReply);
+               msg.set(UID, uid);
+               msg.set(TARGET_LOCATION, target);
+               msg.set(NEAREST_LOCATION, nearest);
+               msg.set(BEST_LOCATION, best);
+               msg.set(COUNTER, counter);
+               return msg;
+       }
+       
+       public static final MessageType FNPProbeRejected = new 
MessageType("FNPProbeRejected") {{
+               addField(UID, Long.class);
+               addField(TARGET_LOCATION, Double.class);
+               addField(NEAREST_LOCATION, Double.class);
+               addField(BEST_LOCATION, Double.class);
+               addField(HTL, Short.class);
+               addField(COUNTER, Short.class);
+               addField(REASON, Short.class);
+       }};
+       
+       public static final Message createFNPProbeRejected(long uid, double 
target, double nearest, 
+                       double best, short counter, short htl, short reason) {
+               Message msg = new Message(FNPProbeRejected);
+               msg.set(UID, uid);
+               msg.set(TARGET_LOCATION, target);
+               msg.set(NEAREST_LOCATION, nearest);
+               msg.set(BEST_LOCATION, best);
+               msg.set(HTL, htl);
+               msg.set(COUNTER, counter);
+               msg.set(REASON, reason);
+               return msg;
+       }

-    static public final short PROBE_REJECTED_LOOP = 1;
-    static public final short PROBE_REJECTED_RNF = 2;
-    static public final short PROBE_REJECTED_OVERLOAD = 3;
-    
-    public static final MessageType FNPSwapRequest = new 
MessageType("FNPSwapRequest") {{
-        addField(UID, Long.class);
-        addField(HASH, ShortBuffer.class);
-        addField(HTL, Integer.class);
-    }};
-    
-    public static final Message createFNPSwapRequest(long uid, byte[] buf, int 
htl) {
-        Message msg = new Message(FNPSwapRequest);
-        msg.set(UID, uid);
-        msg.set(HASH, new ShortBuffer(buf));
-        msg.set(HTL, htl);
-        return msg;
-    }
-    
-    public static final MessageType FNPSwapRejected = new 
MessageType("FNPSwapRejected") {{
-        addField(UID, Long.class);
-    }};
-    
-    public static final Message createFNPSwapRejected(long uid) {
-        Message msg = new Message(FNPSwapRejected);
-        msg.set(UID, uid);
-        return msg;
-    }
-    
-    public static final MessageType FNPSwapReply = new 
MessageType("FNPSwapReply") {{
-        addField(UID, Long.class);
-        addField(HASH, ShortBuffer.class);
-    }};
-    
-    public static final Message createFNPSwapReply(long uid, byte[] buf) {
-        Message msg = new Message(FNPSwapReply);
-        msg.set(UID, uid);
-        msg.set(HASH, new ShortBuffer(buf));
-        return msg;
-    }
+       static public final short PROBE_REJECTED_LOOP = 1;
+       static public final short PROBE_REJECTED_RNF = 2;
+       static public final short PROBE_REJECTED_OVERLOAD = 3;
+       
+       public static final MessageType FNPSwapRequest = new 
MessageType("FNPSwapRequest") {{
+               addField(UID, Long.class);
+               addField(HASH, ShortBuffer.class);
+               addField(HTL, Integer.class);
+       }};
+       
+       public static final Message createFNPSwapRequest(long uid, byte[] buf, 
int htl) {
+               Message msg = new Message(FNPSwapRequest);
+               msg.set(UID, uid);
+               msg.set(HASH, new ShortBuffer(buf));
+               msg.set(HTL, htl);
+               return msg;
+       }
+       
+       public static final MessageType FNPSwapRejected = new 
MessageType("FNPSwapRejected") {{
+               addField(UID, Long.class);
+       }};
+       
+       public static final Message createFNPSwapRejected(long uid) {
+               Message msg = new Message(FNPSwapRejected);
+               msg.set(UID, uid);
+               return msg;
+       }
+       
+       public static final MessageType FNPSwapReply = new 
MessageType("FNPSwapReply") {{
+               addField(UID, Long.class);
+               addField(HASH, ShortBuffer.class);
+       }};
+       
+       public static final Message createFNPSwapReply(long uid, byte[] buf) {
+               Message msg = new Message(FNPSwapReply);
+               msg.set(UID, uid);
+               msg.set(HASH, new ShortBuffer(buf));
+               return msg;
+       }

-    public static final MessageType FNPSwapCommit = new 
MessageType("FNPSwapCommit") {{
-        addField(UID, Long.class);
-        addField(DATA, ShortBuffer.class);
-    }};
-    
-    public static final Message createFNPSwapCommit(long uid, byte[] buf) {
-        Message msg = new Message(FNPSwapCommit);
-        msg.set(UID, uid);
-        msg.set(DATA, new ShortBuffer(buf));
-        return msg;
-    }
-    
-    public static final MessageType FNPSwapComplete = new 
MessageType("FNPSwapComplete") {{
-        addField(UID, Long.class);
-        addField(DATA, ShortBuffer.class);
-    }};
-    
-    public static final Message createFNPSwapComplete(long uid, byte[] buf) {
-        Message msg = new Message(FNPSwapComplete);
-        msg.set(UID, uid);
-        msg.set(DATA, new ShortBuffer(buf));
-        return msg;
-    }
+       public static final MessageType FNPSwapCommit = new 
MessageType("FNPSwapCommit") {{
+               addField(UID, Long.class);
+               addField(DATA, ShortBuffer.class);
+       }};
+       
+       public static final Message createFNPSwapCommit(long uid, byte[] buf) {
+               Message msg = new Message(FNPSwapCommit);
+               msg.set(UID, uid);
+               msg.set(DATA, new ShortBuffer(buf));
+               return msg;
+       }
+       
+       public static final MessageType FNPSwapComplete = new 
MessageType("FNPSwapComplete") {{
+               addField(UID, Long.class);
+               addField(DATA, ShortBuffer.class);
+       }};
+       
+       public static final Message createFNPSwapComplete(long uid, byte[] buf) 
{
+               Message msg = new Message(FNPSwapComplete);
+               msg.set(UID, uid);
+               msg.set(DATA, new ShortBuffer(buf));
+               return msg;
+       }

-    public static final MessageType FNPLocChangeNotification = new 
MessageType("FNPLocationChangeNotification") {{
-        addField(LOCATION, Double.class);
-    }};
-    
-    public static final Message createFNPLocChangeNotification(double newLoc) {
-        Message msg = new Message(FNPLocChangeNotification);
-        msg.set(LOCATION, newLoc);
-        return msg;
-    }
+       public static final MessageType FNPLocChangeNotification = new 
MessageType("FNPLocationChangeNotification") {{
+               addField(LOCATION, Double.class);
+       }};
+       
+       public static final Message createFNPLocChangeNotification(double 
newLoc) {
+               Message msg = new Message(FNPLocChangeNotification);
+               msg.set(LOCATION, newLoc);
+               return msg;
+       }

-    public static final MessageType FNPRoutedPing = new 
MessageType("FNPRoutedPing") {{
-        addRoutedToNodeMessageFields();
-        addField(COUNTER, Integer.class);
-    }};
-    
-    public static final Message createFNPRoutedPing(long uid, double 
targetLocation, short htl, int counter) {
-        Message msg = new Message(FNPRoutedPing);
-        msg.setRoutedToNodeFields(uid, targetLocation, htl);
-        msg.set(COUNTER, counter);
-        return msg;
-    }
-    
-    public static final MessageType FNPRoutedPong = new 
MessageType("FNPRoutedPong") {{
-        addField(UID, Long.class);
-        addField(COUNTER, Integer.class);
-    }};
+       public static final MessageType FNPRoutedPing = new 
MessageType("FNPRoutedPing") {{
+               addRoutedToNodeMessageFields();
+               addField(COUNTER, Integer.class);
+       }};
+       
+       public static final Message createFNPRoutedPing(long uid, double 
targetLocation, short htl, int counter) {
+               Message msg = new Message(FNPRoutedPing);
+               msg.setRoutedToNodeFields(uid, targetLocation, htl);
+               msg.set(COUNTER, counter);
+               return msg;
+       }
+       
+       public static final MessageType FNPRoutedPong = new 
MessageType("FNPRoutedPong") {{
+               addField(UID, Long.class);
+               addField(COUNTER, Integer.class);
+       }};

-    public static final Message createFNPRoutedPong(long uid, int counter) {
-        Message msg = new Message(FNPRoutedPong);
-        msg.set(UID, uid);
-        msg.set(COUNTER, counter);
-        return msg;
-    }
-    
-    public static final MessageType FNPRoutedRejected = new 
MessageType("FNPRoutedRejected") {{
-        addField(UID, Long.class);
-        addField(HTL, Short.class);
-    }};
+       public static final Message createFNPRoutedPong(long uid, int counter) {
+               Message msg = new Message(FNPRoutedPong);
+               msg.set(UID, uid);
+               msg.set(COUNTER, counter);
+               return msg;
+       }
+       
+       public static final MessageType FNPRoutedRejected = new 
MessageType("FNPRoutedRejected") {{
+               addField(UID, Long.class);
+               addField(HTL, Short.class);
+       }};

-    public static final Message createFNPRoutedRejected(long uid, short htl) {
-        Message msg = new Message(FNPRoutedRejected);
-        msg.set(UID, uid);
-        msg.set(HTL, htl);
-        return msg;
-    }
+       public static final Message createFNPRoutedRejected(long uid, short 
htl) {
+               Message msg = new Message(FNPRoutedRejected);
+               msg.set(UID, uid);
+               msg.set(HTL, htl);
+               return msg;
+       }

-    public static final MessageType FNPDetectedIPAddress = new 
MessageType("FNPDetectedIPAddress") {{
-       addField(EXTERNAL_ADDRESS, Peer.class);
-    }};
-    
-    public static final Message createFNPDetectedIPAddress(Peer peer) {
-       Message msg = new Message(FNPDetectedIPAddress);
-       msg.set(EXTERNAL_ADDRESS, peer);
-       return msg;
-    }
+       public static final MessageType FNPDetectedIPAddress = new 
MessageType("FNPDetectedIPAddress") {{
+               addField(EXTERNAL_ADDRESS, Peer.class);
+       }};
+       
+       public static final Message createFNPDetectedIPAddress(Peer peer) {
+               Message msg = new Message(FNPDetectedIPAddress);
+               msg.set(EXTERNAL_ADDRESS, peer);
+               return msg;
+       }

-    public static final MessageType FNPVoid = new MessageType("FNPVoid") {{
-    }};
-    
-    public static final Message createFNPVoid() {
-       Message msg = new Message(FNPVoid);
-       return msg;
-    }
-    
+       public static final MessageType FNPVoid = new MessageType("FNPVoid") {{
+       }};
+       
+       public static final Message createFNPVoid() {
+               Message msg = new Message(FNPVoid);
+               return msg;
+       }
+       
        public static void init() { }

 }


Reply via email to