going to store asap hop list with chunks and transmit with assimilate pdu.

Author: thsc42

src/net/sharksystem/asap/engine/ASAPInternalChunkFS.java

@@ -1,6 +1,7 @@
 package net.sharksystem.asap.engine;
 
 import net.sharksystem.asap.ASAPChannel;
+import net.sharksystem.asap.ASAPHop;
 import net.sharksystem.asap.utils.Helper;
 
 import java.io.*;
@@ -22,6 +23,8 @@ public class ASAPInternalChunkFS implements ASAPInternalChunk {
     private List<Long> messageStartOffsets = new ArrayList<>();
     private File metaFile;
     private File messageFile;
+
+    private List<ASAPHop> hopList;
 
     private int era;
 
@@ -105,6 +108,7 @@ private void initFiles(String trunkName) throws IOException {
             this.recipients = new HashSet<>();
             this.deliveredTo = new ArrayList<>();
             this.messageStartOffsets = new ArrayList<>();
+            this.hopList = new ArrayList<>();
         }
     }
 

src/net/sharksystem/asap/utils/ASAPSerialization.java

@@ -8,7 +8,9 @@
 import net.sharksystem.utils.Log;
 
 import java.io.*;
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 public class ASAPSerialization {
@@ -254,29 +256,63 @@ public static void writeEncounterConnectionType(EncounterConnectionType connecti
 
     public static void writeBooleanParameter(boolean value, OutputStream os) throws IOException {
         if(value) ASAPSerialization.writeByteParameter((byte) 1, os);
-        ASAPSerialization.writeByteParameter((byte) 0, os);
+        else ASAPSerialization.writeByteParameter((byte) 0, os);
     }
 
     public static boolean readBooleanParameter(InputStream is) throws IOException, ASAPException {
         return ASAPSerialization.readByte(is) == 1;
     }
 
+    public static void writeASAPHop(ASAPHop asapHop, OutputStream os) throws IOException {
+        ASAPSerialization.writeCharSequenceParameter(asapHop.sender(), os);
+        ASAPSerialization.writeBooleanParameter(asapHop.verified(), os);
+        ASAPSerialization.writeBooleanParameter(asapHop.encrypted(), os);
+        ASAPSerialization.writeEncounterConnectionType(asapHop.getConnectionType(), os);
+    }
+
     public static byte[] asapHop2ByteArray(ASAPHop asapHop) throws IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        ASAPSerialization.writeCharSequenceParameter(asapHop.sender(), baos);
-        ASAPSerialization.writeBooleanParameter(asapHop.verified(), baos);
-        ASAPSerialization.writeBooleanParameter(asapHop.encrypted(), baos);
-        ASAPSerialization.writeEncounterConnectionType(asapHop.getConnectionType(), baos);
+        writeASAPHop(asapHop, baos);
         return baos.toByteArray();
     }
 
+    public static ASAPHop readASAPHop(InputStream is) throws IOException, ASAPException {
+        CharSequence sender = ASAPSerialization.readCharSequenceParameter(is);
+        boolean verified = ASAPSerialization.readBooleanParameter(is);
+        boolean encrypted = ASAPSerialization.readBooleanParameter(is);
+        EncounterConnectionType connectionType = ASAPSerialization.readEncounterConnectionType(is);
+
+        return new ASAPHopImpl(sender, verified, encrypted, connectionType);
+    }
+
     public static ASAPHop byteArray2ASAPHop(byte[] bytes) throws IOException, ASAPException {
         ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
-        return new ASAPHopImpl(
-            ASAPSerialization.readCharSequenceParameter(bais),
-            ASAPSerialization.readBooleanParameter(bais),
-            ASAPSerialization.readBooleanParameter(bais),
-            ASAPSerialization.readEncounterConnectionType(bais)
-        );
+        return readASAPHop(bais);
+    }
+
+    public static void writeASAPHopList(List<ASAPHop> asapHopList, OutputStream os) throws IOException {
+        if(asapHopList == null || asapHopList.isEmpty()) {
+            // no hops
+            ASAPSerialization.writeIntegerParameter(0, os);
+            return;
+        }
+
+        // write number of hops
+        ASAPSerialization.writeIntegerParameter(asapHopList.size(), os);
+        for(ASAPHop asapHop : asapHopList) {
+            ASAPSerialization.writeASAPHop(asapHop, os);
+        }
+    }
+
+    public static List<ASAPHop> readASAPHopList(InputStream is) throws IOException, ASAPException {
+        List<ASAPHop> asapHopList = new ArrayList<>();
+
+        int number = ASAPSerialization.readIntegerParameter(is);
+        while(number-- > 0) {
+            asapHopList.add(ASAPSerialization.readASAPHop(is));
+        }
+
+        return asapHopList;
+
     }
 }

test/net/sharksystem/asap/serialization/SerializationTests.java

@@ -1,13 +1,19 @@
 package net.sharksystem.asap.serialization;
 
+import net.sharksystem.ASAPHopImpl;
 import net.sharksystem.asap.ASAPException;
+import net.sharksystem.asap.ASAPHop;
+import net.sharksystem.asap.EncounterConnectionType;
 import net.sharksystem.asap.utils.ASAPSerialization;
+import net.sharksystem.asap.utils.PeerIDHelper;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 public class SerializationTests {
     @Test
@@ -21,4 +27,56 @@ public void test1() throws IOException, ASAPException {
 
         Assert.assertTrue(messageOut.equals(messageIn));
     }
+
+    @Test
+    public void serializeASAPHopListLen1() throws IOException, ASAPException {
+        List<ASAPHop> exampleList = new ArrayList<>();
+
+        exampleList.add(new ASAPHopImpl("Alice", true, true, EncounterConnectionType.ASAP_HUB));
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ASAPSerialization.writeASAPHopList(exampleList, baos);
+
+        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+        List<ASAPHop> receivedList = ASAPSerialization.readASAPHopList(bais);
+
+        Assert.assertEquals(exampleList.size(), receivedList.size());
+        for(int i = 0; i < exampleList.size(); i++) {
+            ASAPHop origHop = exampleList.get(i);
+            ASAPHop receivedHop = receivedList.get(i);
+
+            Assert.assertTrue(PeerIDHelper.sameID(origHop.sender(), receivedHop.sender()));
+            Assert.assertTrue(origHop.verified() == receivedHop.verified());
+            Assert.assertTrue(origHop.encrypted() == receivedHop.encrypted());
+            Assert.assertTrue(origHop.getConnectionType() == receivedHop.getConnectionType());
+        }
+    }
+
+    @Test
+    public void serializeASAPHopListLen5() throws IOException, ASAPException {
+        List<ASAPHop> exampleList = new ArrayList<>();
+
+        exampleList.add(new ASAPHopImpl("Alice", true, true, EncounterConnectionType.ASAP_HUB));
+        exampleList.add(new ASAPHopImpl("Bob", false, true, EncounterConnectionType.INTERNET));
+        exampleList.add(new ASAPHopImpl("Clara", false, false, EncounterConnectionType.AD_HOC_LAYER_2_NETWORK));
+        exampleList.add(new ASAPHopImpl("David", true, false, EncounterConnectionType.ONION_NETWORK));
+        exampleList.add(new ASAPHopImpl("Eveline", true, false, EncounterConnectionType.UNKNOWN));
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ASAPSerialization.writeASAPHopList(exampleList, baos);
+
+        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+        List<ASAPHop> receivedList = ASAPSerialization.readASAPHopList(bais);
+
+        Assert.assertEquals(exampleList.size(), receivedList.size());
+        for(int i = 0; i < exampleList.size(); i++) {
+            ASAPHop origHop = exampleList.get(i);
+            ASAPHop receivedHop = receivedList.get(i);
+
+            Assert.assertTrue(PeerIDHelper.sameID(origHop.sender(), receivedHop.sender()));
+            Assert.assertTrue(origHop.verified() == receivedHop.verified());
+            Assert.assertTrue(origHop.encrypted() == receivedHop.encrypted());
+            Assert.assertTrue(origHop.getConnectionType() == receivedHop.getConnectionType());
+        }
+    }
 }