[GNUnet-SVN] r3065 - in freeway: native src/org/gnu/freeway/util/net

[mdonoughe]

Author: mdonoughe
Date: 2006-06-26 12:58:16 -0700 (Mon, 26 Jun 2006)
New Revision: 3065

Modified:
   freeway/native/org_gnu_freeway_server_CPluginLoader.c
   freeway/src/org/gnu/freeway/util/net/CSNativeMessage.java
Log:
print first four bytes of mesages as they cross between Java and C


Modified: freeway/native/org_gnu_freeway_server_CPluginLoader.c
===================================================================
--- freeway/native/org_gnu_freeway_server_CPluginLoader.c       2006-06-26 
19:18:24 UTC (rev 3064)
+++ freeway/native/org_gnu_freeway_server_CPluginLoader.c       2006-06-26 
19:58:16 UTC (rev 3065)
@@ -619,6 +619,7 @@
   GNUNET_ASSERT(handle != NULL);
   GNUNET_ASSERT(message != NULL);
   GNUNET_ASSERT(message->size >= 4);
+fprintf(stderr, "jsendToClient %02x %02x %02x %02x\n", ((char *) message)[0] & 
0xff, ((char *) message)[1] & 0xff, ((char *) message)[2] & 0xff, ((char *) 
message)[3] & 0xff);
   t = findThread();
   env = t->env;
   GNUNET_ASSERT(env != NULL);
@@ -898,6 +899,7 @@
   GNUNET_ASSERT(adata != NULL);
   
 fprintf(stderr, "calling %x to handle a packet\n", fptr);
+fprintf(stderr, "cCallCallCSHandle %02x %02x %02x %02x\n", ((char *) adata)[0] 
& 0xff, ((char *) adata)[1] & 0xff, ((char *) adata)[2] & 0xff, ((char *) 
adata)[3] & 0xff);
   ok = ((CSHandler) (void*) (long)fptr)((ClientHandle) (long) session, 
(CS_MESSAGE_HEADER *) adata);
   (*env)->ReleaseByteArrayElements(env, data, adata, 0);
   unregisterThread();

Modified: freeway/src/org/gnu/freeway/util/net/CSNativeMessage.java
===================================================================
--- freeway/src/org/gnu/freeway/util/net/CSNativeMessage.java   2006-06-26 
19:18:24 UTC (rev 3064)
+++ freeway/src/org/gnu/freeway/util/net/CSNativeMessage.java   2006-06-26 
19:58:16 UTC (rev 3065)
@@ -28,13 +28,13 @@
        }
 
        public CSNativeMessage(byte[] data) {
-               super( 1 );
+               super( ((data[2] & 0xff) << 8) + (data[3] & 0xff) );
                arr = data;
        }
 
        public String toString()
        {
-               return "lame hack: NativeMessage";
+               return "lame hack: NativeMessage "+ hex(arr[0]) + " " + 
hex(arr[1]) + " " + hex(arr[2]) + " " + hex(arr[3]);
        }
 
 
@@ -58,10 +58,19 @@
                
                arr = new byte[size];
                buf.get(arr);
+               System.err.println("CSNativeMessage readBytes " + hex(arr[0]) + 
" " + hex(arr[1]) + " " + hex(arr[2]) + " " + hex(arr[3]));
        }
+       
+       private String hex(byte in) {
+               String[] l = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", 
"a", "b", "c", "d", "e", "f"};
+               byte a = (byte) ((in & 0xff) / 16);
+               byte b = (byte) ((in & 0xff) % 16);
+               return l[a] + l[b];
+       }
 
        public void writeBytes( ByteBuffer buf )
        {
                buf.put(arr);
+               System.err.println("CSNativeMessage writeBytes " + hex(arr[0]) 
+ " " + hex(arr[1]) + " " + hex(arr[2]) + " " + hex(arr[3]));
        }
 }