* refactored the Construct library to use ByteBuffer internally, some other fixes to the construct library

* clients can now handle disconnects correctly, implemented in NSE
* started implementation of the DHT api

2 files changed, 27 insertions, 13 deletions

diff --git a/test/org/gnunet/construct/ConstructTest.java b/test/org/gnunet/construct/ConstructTest.java
index a160f1b..e0e7b85 100644
--- a/test/org/gnunet/construct/ConstructTest.java
+++ b/test/org/gnunet/construct/ConstructTest.java
@@ -4,28 +4,34 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import java.math.BigInteger;
+import java.nio.ByteBuffer;
 
 public class ConstructTest {
     
     
     @Test
     public void test_ByteFillMessage() {
-        System.out.println("testing ByteFillMessage");
         
         ByteFillMessage bfm = new ByteFillMessage();
         bfm.header = new MessageHeader();
         bfm.someValue = 42;
-        bfm.rest = new byte[] {1,2,3,4,5,6,7,100};
+        bfm.rest = new byte[] {1,2,3,4,5,6,7,100, 8};
         
-        Construct.patchSizeFields(bfm);
+        Construct.patch(bfm);
         
         bfm.header.messageSize = Construct.getSize(bfm);
+
+        bfm.header.messageType = 42;
         
         System.out.println(bfm.header.messageSize);
         
         byte[] data = Construct.toBinary(bfm);
+        
+        Assert.assertEquals(Construct.getSize(bfm), data.length);
+        
+        System.out.println("data size: " + data.length);
 
-        ByteFillMessage bfm2 = Construct.parseAs(data, 0, ByteFillMessage.class);
+        ByteFillMessage bfm2 = Construct.parseAs(ByteBuffer.wrap(data), ByteFillMessage.class);
         
         Assert.assertArrayEquals(bfm.rest, bfm2.rest);
     }
@@ -43,7 +49,7 @@ public class ConstructTest {
 
         byte[] a = Construct.toBinary(vtm);
 
-        VarTestMessage vtm2 = Construct.parseAs(a, 0, VarTestMessage.class);
+        VarTestMessage vtm2 = Construct.parseAs(ByteBuffer.wrap(a), VarTestMessage.class);
 
         Assert.assertEquals(vtm2.length, 5);
         for (int i = 0; i < 5; ++i) {
@@ -66,7 +72,7 @@ public class ConstructTest {
         }
 
         byte[] a = Construct.toBinary(stm);
-        SimpleTestMessage stm2 = Construct.parseAs(a, 0,
+        SimpleTestMessage stm2 = Construct.parseAs(ByteBuffer.wrap(a),
                 SimpleTestMessage.class);
 
         Assert.assertEquals(stm.v1, stm2.v1);
@@ -93,7 +99,7 @@ public class ConstructTest {
         strm.num2 = 80;
 
         byte[] a = Construct.toBinary(strm);
-        StringMessage strm2 = Construct.parseAs(a, 0, StringMessage.class);
+        StringMessage strm2 = Construct.parseAs(ByteBuffer.wrap(a), StringMessage.class);
 
         for (byte b : a) {
             System.out.print((char) b);
@@ -114,13 +120,13 @@ public class ConstructTest {
         qm.varsize = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
                 14, 15 };
 
-        Construct.patchSizeFields(qm);
+        Construct.patch(qm);
 
         byte[] a = Construct.toBinary(qm);
         
         Assert.assertEquals(a.length, qm.header.messageSize);
 
-        QueryMessage qm2 = Construct.parseAs(a, 0, QueryMessage.class);
+        QueryMessage qm2 = Construct.parseAs(ByteBuffer.wrap(a), QueryMessage.class);
 
         Assert.assertEquals(qm.header.messageSize, qm2.header.messageSize);
         Assert.assertEquals(qm.header.messageType, qm2.header.messageType);
@@ -136,11 +142,11 @@ public class ConstructTest {
         stm.someValue = 42;
         stm.rest = new byte[] { 1, 2, 3, 4, 5 };
 
-        Construct.patchSizeFields(stm);
+        Construct.patch(stm);
 
         byte[] a = Construct.toBinary(stm);
 
-        SizeTestMessage stm2 = Construct.parseAs(a, 0, SizeTestMessage.class);
+        SizeTestMessage stm2 = Construct.parseAs(ByteBuffer.wrap(a), SizeTestMessage.class);
 
         Assert.assertEquals(stm.someValue, stm2.someValue);
         Assert.assertEquals(stm.totalSize, stm2.totalSize);
@@ -157,7 +163,7 @@ public class ConstructTest {
 
         byte[] a = Construct.toBinary(h1);
 
-        MessageHeader h2 = Construct.parseAs(a, 0, MessageHeader.class);
+        MessageHeader h2 = Construct.parseAs(ByteBuffer.wrap(a), MessageHeader.class);
 
         byte[] b = Construct.toBinary(h2);
 
diff --git a/test/org/gnunet/construct/UnionTest.java b/test/org/gnunet/construct/UnionTest.java
index ba74a8b..68c97b8 100644
--- a/test/org/gnunet/construct/UnionTest.java
+++ b/test/org/gnunet/construct/UnionTest.java
@@ -1,8 +1,11 @@
 package org.gnunet.construct;
 
 
+import org.junit.Assert;
 import org.junit.Test;
 
+import java.nio.ByteBuffer;
+
 public class UnionTest {
     public static interface TestUnion extends MessageUnion {}
     
@@ -37,8 +40,13 @@ public class UnionTest {
         byte[] a = Construct.toBinary(utm);
         
         System.out.println(a.length);
+        System.out.println(Construct.getSize(utm));
+
+        
+        UnionTestMessage utm2 = Construct.parseAs(ByteBuffer.wrap(a), UnionTestMessage.class);
+        
         
-        UnionTestMessage utm2 = Construct.parseAs(a, 0, UnionTestMessage.class);
+        Assert.assertEquals(((TestUnionCase0) utm.instance).val, ((TestUnionCase0) utm2.instance).val);
 
     }
 }