multihop with closed channels works with one hop now.

Author: thsc42

src/net/sharksystem/asap/MultiASAPEngineFS.java

@@ -19,7 +19,7 @@
  *
  * That interface hides those different engines.
  */
-public interface MultiASAPEngineFS extends ASAPManagementProtocolEngine {
+public interface MultiASAPEngineFS {
     public static final long DEFAULT_MAX_PROCESSING_TIME = Long.MAX_VALUE;
 
     public ASAPEngine getEngineByFormat(CharSequence format) throws ASAPException, IOException;

src/net/sharksystem/asap/MultiASAPEngineFS_Impl.java

@@ -10,7 +10,7 @@
 import java.util.*;
 
 public class MultiASAPEngineFS_Impl implements
-        MultiASAPEngineFS, ASAPManagementProtocolEngine, ASAPConnectionListener, ThreadFinishedListener {
+        MultiASAPEngineFS, ASAPConnectionListener, ThreadFinishedListener, ASAPChunkReceivedListener {
     private final CharSequence rootFolderName;
     private final ASAPChunkReceivedListener listener;
     private CharSequence owner;
@@ -74,6 +74,12 @@ private void setupFolderMap() throws IOException, ASAPException {
                 this.folderMap.put(engine.format, setting);
             }
         }
+
+        // set yourself as listener to asap management app
+        EngineSetting folderAndListener = folderMap.get(ASAP_1_0.ASAP_MANAGEMENT_FORMAT);
+        if(folderAndListener != null) {
+            folderAndListener.listener = this;
+        }
     }
 
     /**
@@ -360,30 +366,40 @@ public void pushInterests(OutputStream os) throws IOException, ASAPException {
         }
     }
 
-    public boolean handleASAPManagementPDU(ASAP_PDU_1_0 asapPDU, ASAP_1_0 protocol,
-                                           InputStream is) throws ASAPException, IOException {
+    private String getLogStart() {
+        return this.getClass().getSimpleName() + "(" + this.getOwner() + "): ";
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////////
+    //                            chunk received listener for asap management engine                     //
+    ///////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void chunkReceived(String sender, String uri, int era) {
+        System.out.println(this.getLogStart()
+                + "handle received chunk (sender/uri/era)" + sender + "/" + uri + "/" + era);
+        try {
+            ASAPEngine asapManagementEngine = this.getEngineByFormat(ASAP_1_0.ASAP_MANAGEMENT_FORMAT);
+            ASAPChunkStorage incomingChunkStorage = asapManagementEngine.getIncomingChunkStorage(sender);
+            ASAPChunk chunk = incomingChunkStorage.getChunk(uri, era);
+            Iterator<byte[]> messageIter = chunk.getMessagesAsBytes();
+            System.out.println(this.getLogStart() + "iterate management messages");
+            while(messageIter.hasNext()) {
+                byte[] message = messageIter.next();
+                this.handleASAPManagementMessage(sender, message);
+            }
+            System.out.println(this.getLogStart() + "done iterating management messages");
+        } catch (ASAPException | IOException e) {
+            System.out.println("could get asap management engine but received chunk - looks like a bug");
+        }
+    }
 
+    private void handleASAPManagementMessage(CharSequence owner, byte[] message) throws ASAPException, IOException {
         StringBuilder b = new StringBuilder();
         b.append(this.getLogStart());
         b.append("start processing asap management pdu");
         System.out.println(b.toString());
 
-        System.out.println(this.getLogStart() + asapPDU);
-
-        ASAP_AssimilationPDU_1_0 asap_assimilationPDU_1_0 = null;
-        if(asapPDU instanceof ASAP_AssimilationPDU_1_0) {
-            asap_assimilationPDU_1_0 = (ASAP_AssimilationPDU_1_0) asapPDU;
-        } else {
-            b = new StringBuilder();
-            b.append(this.getLogStart());
-            b.append("asap management pdu not an assimilate message - let ordinary engine to the job");
-            System.out.println(b.toString());
-            return false;
-        }
-
-        CharSequence owner = asapPDU.getPeer();
-        byte[] message = asap_assimilationPDU_1_0.getData();
-
         ASAPManagementCreateASAPStorageMessage asapManagementCreateASAPStorageMessage =
                 ASAPManagementMessage.parseASAPManagementMessage(owner, message);
 
@@ -395,7 +411,7 @@ public boolean handleASAPManagementPDU(ASAP_PDU_1_0 asapPDU, ASAP_1_0 protocol,
         List<CharSequence> recipients = new ArrayList<>();
 
         // add owner
-        recipients.add(asapPDU.getPeer());
+        recipients.add(owner);
 
         // add rest
         for(CharSequence r : receivedRecipients) {
@@ -412,7 +428,6 @@ public boolean handleASAPManagementPDU(ASAP_PDU_1_0 asapPDU, ASAP_1_0 protocol,
         b.append(channelUri);
         b.append(" | #recipients: ");
         b.append(recipients.size());
-        System.out.println(b.toString());
 
         // find storage / app - can throw an exception - that's ok
         ASAPStorage asapStorage = this.getEngineByFormat(format);
@@ -433,25 +448,18 @@ public boolean handleASAPManagementPDU(ASAP_PDU_1_0 asapPDU, ASAP_1_0 protocol,
                         }
                     }
                     if(!found) {
-                        throw new ASAPException("channel already exists but with different recipients");
+                        throw new ASAPException("channel already exists but with different recipients: " + b.toString());
                     }
                 }
                 // ok it the same
-                return false;
+                return;
             } else {
-                throw new ASAPException("channel already exists but with different settings");
+                throw new ASAPException("channel already exists but with different settings: " + b.toString());
             }
         }
 
         // else - channel does not exist - create by setting recipients
-        System.out.println(this.getLogStart() + "create channel");
+        System.out.println(this.getLogStart() + "create channel: " + b.toString());
         asapStorage.createChannel(channelUri, recipients);
-        System.err.println(this.getLogStart() + ".handleASAPManagementPDU(): TODO: return true - works / false not - but must be false...");
-//        return true;
-        return false;
-    }
-
-    private String getLogStart() {
-        return this.getClass().getSimpleName() + "(" + this.getOwner() + "): ";
     }
 }

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

@@ -213,6 +213,7 @@ public void run() {
 
                 // process received pdu
                 boolean pduExecuted = false;
+                /*
                 if(asappdu.getFormat().equalsIgnoreCase(ASAP_1_0.ASAP_MANAGEMENT_FORMAT)) {
                     System.out.println(this.getLogStart()
                             + "got asap management message - let multi-engine handle this one");
@@ -229,7 +230,7 @@ public void run() {
                         break;
                     }
                 }
-
+                */
                 if(!pduExecuted) { // not (completely executed by multi engine
                     try {
                         this.executor = new ASAPPDUExecutor(asappdu,