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

Author: thsc42

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

@@ -793,6 +793,7 @@ private void sendChunks(CharSequence sender, String encounteredPeer, ASAPChunkSt
                             workingEra, // era ok
                             chunk.getLength(), // data length
                             chunk.getOffsetList(),
+                            chunk.getASAPHopList(),
                             chunk.getMessageInputStream(),
                             os,
                             this.getASAPCommunicationCryptoSettings());

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

@@ -2,6 +2,7 @@
 
 import net.sharksystem.asap.ASAPChannel;
 import net.sharksystem.asap.ASAPChunk;
+import net.sharksystem.asap.ASAPHop;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -83,4 +84,6 @@ public interface ASAPInternalChunk extends ASAPChunk {
     List<CharSequence> getDeliveredTo();
 
     void copyMetaData(ASAPChannel channel) throws IOException;
+
+    List<ASAPHop> getASAPHopList();
 }

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

@@ -51,6 +51,11 @@ public void copyMetaData(ASAPChannel channel) throws IOException {
         this.saveStatus();
     }
 
+    @Override
+    public List<ASAPHop> getASAPHopList() {
+        return this.hopList;
+    }
+
     public HashMap<String, String> getExtraData() {
         return this.extraData;
     }

src/net/sharksystem/asap/protocol/ASAP_1_0.java

@@ -1,6 +1,7 @@
 package net.sharksystem.asap.protocol;
 
 import net.sharksystem.asap.ASAPException;
+import net.sharksystem.asap.ASAPHop;
 import net.sharksystem.asap.ASAPSecurityException;
 import net.sharksystem.asap.crypto.ASAPPoint2PointCryptoSettings;
 
@@ -160,8 +161,9 @@ void assimilate(CharSequence sender, CharSequence recipient, CharSequence format
             throws IOException, ASAPException;
 
 
-    public void assimilate(CharSequence sender, CharSequence recipient, CharSequence format,
-                           CharSequence channel, int era, long length, List<Long> offsets, InputStream dataIS,
+    void assimilate(CharSequence sender, CharSequence recipient, CharSequence format,
+                           CharSequence channel, int era, long length, List<Long> offsets, List<ASAPHop> asapHopList,
+                           InputStream dataIS,
                            OutputStream os, ASAPPoint2PointCryptoSettings secureSetting) throws IOException, ASAPException;
 
     /**

src/net/sharksystem/asap/protocol/ASAP_Modem_Impl.java

@@ -1,6 +1,7 @@
 package net.sharksystem.asap.protocol;
 
 import net.sharksystem.asap.ASAPException;
+import net.sharksystem.asap.ASAPHop;
 import net.sharksystem.asap.ASAPSecurityException;
 import net.sharksystem.asap.engine.ASAPUndecryptableMessageHandler;
 import net.sharksystem.asap.crypto.ASAPCryptoAlgorithms;
@@ -148,8 +149,11 @@ public void assimilate(CharSequence sender, CharSequence recipient, CharSequence
 
     @Override
     public void assimilate(CharSequence sender, CharSequence recipient, CharSequence format,
-                           CharSequence channel, int era, long length, List<Long> offsets, InputStream dataIS,
-                           OutputStream os, ASAPPoint2PointCryptoSettings secureSetting) throws IOException, ASAPException {
+                           CharSequence channel, int era, long length, List<Long> offsets, List<ASAPHop> asapHops,
+                           InputStream dataIS, OutputStream os,
+                           ASAPPoint2PointCryptoSettings secureSetting)
+
+            throws IOException, ASAPException {
 
         this.assimilate(sender, recipient, format, channel, era, length, offsets, dataIS, os,
                 secureSetting.mustSign(), secureSetting.mustEncrypt());