routed messages are put into incoming storage of originator and instead of folder of last hop.

Author: thsc42

src/net/sharksystem/asap/ASAPEngine.java

@@ -438,7 +438,7 @@ public void handleASAPInterest(ASAP_Interest_PDU_1_0 asapInterest, ASAP_1_0 prot
         System.out.println(b.toString());
         //>>>>>>>>>>>>>>>>>>>debug
 
-        this.sendChunks(peer, this.getChunkStorage(), protocol, workingEra, lastEra, os);
+        this.sendChunks(this.owner, peer, this.getChunkStorage(), protocol, workingEra, lastEra, os);
         //<<<<<<<<<<<<<<<<<<debug
         b = new StringBuilder();
         b.append(this.getLogStart());
@@ -453,7 +453,7 @@ public void handleASAPInterest(ASAP_Interest_PDU_1_0 asapInterest, ASAP_1_0 prot
                 System.out.println(this.getLogStart() + "send chunks received from: " + sender);
                 ASAPChunkStorage incomingChunkStorage = this.getIncomingChunkStorage(sender);
 
-                this.sendChunks(peer, incomingChunkStorage, protocol, workingEra, lastEra, os);
+                this.sendChunks(sender, peer, incomingChunkStorage, protocol, workingEra, lastEra, os);
             }
         }
     }
@@ -467,7 +467,7 @@ public void setSendReceivedChunks(boolean on) throws IOException {
         this.saveStatus();
     }
 
-    private void sendChunks(String peer, ASAPChunkStorage chunkStorage,
+    private void sendChunks(CharSequence sender, String recipient, ASAPChunkStorage chunkStorage,
                             ASAP_1_0 protocol, int workingEra,
                             int lastEra, OutputStream os) throws IOException, ASAPException {
         /*
@@ -509,7 +509,7 @@ private void sendChunks(String peer, ASAPChunkStorage chunkStorage,
                 if (!this.isPublic(chunk)) {
                     List<CharSequence> recipients = chunk.getRecipients();
 
-                    if (!recipients.contains(peer)) {
+                    if (!recipients.contains(recipient)) {
                         continue;
                     }
                 }
@@ -522,13 +522,13 @@ private void sendChunks(String peer, ASAPChunkStorage chunkStorage,
                 //>>>>>>>>>>>>>>>>>>>debug
 
                 /*
-    void assimilate(CharSequence peer, CharSequence recipientPeer, CharSequence format, CharSequence channel, int era,
+    void assimilate(CharSequence recipient, CharSequence recipientPeer, CharSequence format, CharSequence channel, int era,
                     int length, List<Integer> offsets, InputStream dataIS, OutputStream os, boolean signed)
             throws IOException, ASAPException;
                  */
 
-                protocol.assimilate(this.owner, // peer
-                        peer, // recipient
+                protocol.assimilate(sender, // recipient
+                        recipient, // recipient
                         this.format,
                         chunk.getUri(), // channel ok
                         workingEra, // era ok
@@ -539,12 +539,12 @@ void assimilate(CharSequence peer, CharSequence recipientPeer, CharSequence form
                         false);
 
                 // remember sent
-                chunk.deliveredTo(peer);
+                chunk.deliveredTo(recipient);
                 //<<<<<<<<<<<<<<<<<<debug
                 b = new StringBuilder();
                 b.append(this.getLogStart());
                 b.append("remembered delivered to ");
-                b.append(peer);
+                b.append(recipient);
                 System.out.println(b.toString());
                 //>>>>>>>>>>>>>>>>>>>debug
                 // sent to all recipients
@@ -567,7 +567,7 @@ void assimilate(CharSequence peer, CharSequence recipientPeer, CharSequence form
             }
 
             // remember that we are in sync until that era
-            this.setLastSeen(peer, workingEra);
+            this.setLastSeen(recipient, workingEra);
 
             // make a breakpoint here
             if(this.memento != null) this.memento.save(this);

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

@@ -36,7 +36,7 @@ public ASAPPersistentConnection(InputStream is, OutputStream os, MultiASAPEngine
     }
 
     private String getLogStart() {
-        return this.getClass().getSimpleName() + "(connected to: " + this.remotePeer + "): ";
+        return this.getClass().getSimpleName() + "(to: " + this.remotePeer + "): ";
     }
 
     private void setRemotePeer(String remotePeerName) {
@@ -386,18 +386,18 @@ public void run() {
                         engineSetting.engine.handleASAPOffer((ASAP_OfferPDU_1_0) asapPDU, protocol, os);
                         break;
                     case ASAP_1_0.ASSIMILATE_CMD:
-                        System.out.println("getLogStart() + ASAPPDUExecutor call handleASAPAssimilate");
+                        System.out.println(getLogStart() + "ASAPPDUExecutor call handleASAPAssimilate");
                         engineSetting.engine.handleASAPAssimilate((ASAP_AssimilationPDU_1_0) asapPDU, protocol, is, os,
                                 engineSetting.listener);
                         break;
 
                     default:
-                        System.err.println(
-                                this.getClass().getSimpleName() + ": " + "unknown ASAP command: " + asapPDU.getCommand());
+                        System.err.println(getLogStart() + ": " + "unknown ASAP command: " + asapPDU.getCommand());
                 }
             }
             catch(IOException | ASAPException e) {
-                System.err.println("Exception while processing ASAP PDU - close streams" + e.getLocalizedMessage());
+                System.err.println(getLogStart()
+                        + "Exception while processing ASAP PDU - close streams" + e.getLocalizedMessage());
                 try {
                     os.close(); // more important to close than input stream - do it first
                     is.close();

test/net/sharksystem/asap/MultihopTests.java

@@ -78,10 +78,11 @@ public void twoHops() throws IOException, ASAPException, InterruptedException {
         String rootFolder = ui.getEngineRootFolderByStorageName("Clara:twoHops");
         ASAPStorage clara = ASAPEngineFS.getExistingASAPEngineFS(rootFolder);
 
-        /* that asap message is from Bob even if it was created by Alice .. !!
-        apps on top of asap could and should deal differently with ownership of messages.
+        /* message was actually from Bob but originated from Alice. It is put
+        into a incoming folder as it would have been directly received from Alice.
+        Signatures would allow ensuring if origin was really who mediator claims to be.
         */
-        ASAPChunkStorage claraBob = clara.getIncomingChunkStorage("Bob");
+        ASAPChunkStorage claraBob = clara.getIncomingChunkStorage("Alice");
 
         // clara era was increased after connection terminated - message from bob is in era before current one
         int eraToLook = ASAPEngine.previousEra(clara.getEra());