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

[zot...@freenetproject.org]

Author: zothar
Date: 2006-11-23 14:51:34 +0000 (Thu, 23 Nov 2006)
New Revision: 11038

Modified:
   trunk/freenet/src/freenet/io/comm/DMT.java
   trunk/freenet/src/freenet/node/Node.java
Log:
Switch NODE_TO_NODE_MESSAGE_DATA to ShortBuffer.  We'll not start sending 
DMT.nodeToNodeMessages until 1000 or after.

Modified: trunk/freenet/src/freenet/io/comm/DMT.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/DMT.java  2006-11-23 14:30:28 UTC (rev 
11037)
+++ trunk/freenet/src/freenet/io/comm/DMT.java  2006-11-23 14:51:34 UTC (rev 
11038)
@@ -357,7 +357,7 @@
        // Node-To-Node Message (generic)
        public static final MessageType nodeToNodeMessage = new 
MessageType("nodeToNodeMessage", false) {{
                addField(NODE_TO_NODE_MESSAGE_TYPE, Integer.class);
-               addField(NODE_TO_NODE_MESSAGE_DATA, String.class);
+               addField(NODE_TO_NODE_MESSAGE_DATA, ShortBuffer.class);
        }};

        public static final Message createNodeToNodeMessage(int type, String 
data) {

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-11-23 14:30:28 UTC (rev 
11037)
+++ trunk/freenet/src/freenet/node/Node.java    2006-11-23 14:51:34 UTC (rev 
11038)
@@ -99,6 +99,7 @@
 import freenet.support.LRUHashtable;
 import freenet.support.LRUQueue;
 import freenet.support.Logger;
+import freenet.support.ShortBuffer;
 import freenet.support.SimpleFieldSet;
 import freenet.support.TimeUtil;
 import freenet.support.TokenBucket;
@@ -2810,11 +2811,11 @@
          PeerNode source = (PeerNode)m.getSource();
          int type = ((Integer) 
m.getObject(DMT.NODE_TO_NODE_MESSAGE_TYPE)).intValue();
          if(type == Node.N2N_MESSAGE_TYPE_FPROXY_USERALERT) {
-               String messageData = (String) 
m.getObject(DMT.NODE_TO_NODE_MESSAGE_DATA);
+               ShortBuffer messageData = (ShortBuffer) 
m.getObject(DMT.NODE_TO_NODE_MESSAGE_DATA);
                Logger.normal(this, "Received N2NM from '"+source.getPeer());
                SimpleFieldSet fs = null;
                try {
-                       fs = new SimpleFieldSet(messageData);
+                       fs = new SimpleFieldSet(messageData.toString());
                } catch (IOException e) {
                        Logger.error(this, "IOException while parsing node to 
node message data", e);
                        return;