closed channel is created but message exchange still fails.

Author: thsc42

src/net/sharksystem/asap/MultiASAPEngineFS_Impl.java

@@ -403,7 +403,7 @@ public boolean handleASAPManagementPDU(ASAP_PDU_1_0 asapPDU, ASAP_1_0 protocol,
         b.append(recipients.size());
         System.out.println(b.toString());
 
-        // find storage
+        // find storage / app - can throw an exception - that's ok
         ASAPStorage asapStorage = this.getEngineByFormat(format);
 
         if(asapStorage.channelExists(channelUri)) {
@@ -433,8 +433,9 @@ public boolean handleASAPManagementPDU(ASAP_PDU_1_0 asapPDU, ASAP_1_0 protocol,
         }
 
         // else - channel does not exist - create by setting recipients
+        System.out.println(this.getLogStart() + "create channel");
         asapStorage.createChannel(channelUri, recipients);
-        return false;
+        return true;
     }
 
     private String getLogStart() {

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

@@ -174,23 +174,7 @@ private synchronized void checkRunningOnlineMessageSender() {
 
     public void run() {
         ASAP_1_0 protocol = new ASAP_Modem_Impl();
-/*
-        // introduce yourself
-        CharSequence owner = this.multiASAPEngineFS.getOwner();
-        if(owner != null && owner.length() > 0) {
-            try {
-                System.out.println(this.getLogStart() + "send introduction ASAP Offer; owner: " + owner);
-                this.sendIntroductionOffer(owner, false);
-            } catch (IOException e) {
-                this.terminate("io error when sending introduction offering: ", e);
-                return;
-            } catch (ASAPException e) {
-                System.out.println(this.getLogStart()
-                        + "could not send introduction offer: " + e.getLocalizedMessage());
-                // go ahead - no io problem
-            }
-        }
-*/
+
         try {
             // let engine write their interest - at least management interest is sent which als introduces
             // this peer to the other one
@@ -237,7 +221,7 @@ public void run() {
                         // if return true - message was handled. No further actions required
                         pduExecuted = this.multiASAPEngineFS.handleASAPManagementPDU(asappdu, protocol, is);
                     } catch (ASAPException e) {
-                        System.err.println("asap management pdu processing failed - go ahead in read/process loop"
+                        System.err.println("asap management pdu processing failed - go ahead in read/process loop: "
                                 + e.getLocalizedMessage());
                         pduExecuted = false; // failed to execute - forget and go ahead
                     } catch (IOException e) {

src/net/sharksystem/cmdline/CmdLineUI.java

@@ -18,7 +18,7 @@ public class CmdLineUI {
     public static final String KILL = "kill";
     public static final String SETWAITING = "setwaiting";
     public static final String CREATE_ASAP_ENGINE = "newengine";
-    public static final String CREATE_ASAP_STORAGE = "newstorage";
+    public static final String CREATE_ASAP_APP = "newapp";
     public static final String CREATE_ASAP_CHANNEL = "newchannel";
     public static final String CREATE_ASAP_MESSAGE = "newmessage";
     public static final String RESET_ASAP_STORAGES = "resetstorage";
@@ -80,8 +80,8 @@ public void printUsage() {
         b.append(CREATE_ASAP_ENGINE);
         b.append(".. create new asap engine");
         b.append("\n");
-        b.append(CREATE_ASAP_STORAGE);
-        b.append(".. create new asap storage");
+        b.append(CREATE_ASAP_APP);
+        b.append(".. create new asap app (==storage)");
         b.append("\n");
         b.append(CREATE_ASAP_CHANNEL);
         b.append(".. create new closed asap channel");
@@ -143,9 +143,9 @@ public void printUsage(String cmdString, String comment) {
                 out.println("example: " + CREATE_ASAP_ENGINE + " Alice");
                 out.println("create engine called Alice - data kept under a folder called tests/Alice");
                 break;
-            case CREATE_ASAP_STORAGE:
-                out.println(CREATE_ASAP_STORAGE + " owner appName");
-                out.println("example: " + CREATE_ASAP_STORAGE + " Alice chat");
+            case CREATE_ASAP_APP:
+                out.println(CREATE_ASAP_APP + " owner appName");
+                out.println("example: " + CREATE_ASAP_APP + " Alice chat");
                 break;
             case CREATE_ASAP_CHANNEL:
                 out.println(CREATE_ASAP_CHANNEL + " owner appName uri (recipient)+");
@@ -216,7 +216,8 @@ public void runCommandLoop() {
                         this.doSetWaiting(parameterString); break;
                     case CREATE_ASAP_ENGINE:
                         this.doCreateASAPMultiEngine(parameterString); break;
-                    case CREATE_ASAP_STORAGE: // same
+                    case CREATE_ASAP_APP: // same
+                        this.doCreateASAPApp(parameterString); break;
                     case CREATE_ASAP_CHANNEL:
                         this.doCreateASAPChannel(parameterString); break;
                     case CREATE_ASAP_MESSAGE:
@@ -396,39 +397,57 @@ public void doCreateASAPMultiEngine(String parameterString) {
         }
     }
 
-    public void doCreateASAPChannel(String parameterString) {
+    public void doCreateASAPApp(String parameterString) {
         StringTokenizer st = new StringTokenizer(parameterString);
 
         try {
             String owner = st.nextToken();
             String appName = st.nextToken();
-            String uri = st.nextToken();
 
             String appFolderName = TESTS_ROOT_FOLDER + "/" + owner + "/" + appName;
-            String format = "sn2://" + appName;
-
-            List<CharSequence> recipients = new ArrayList<>();
-            while(st.hasMoreTokens()) {
-                recipients.add(st.nextToken());
-            }
 
-            ASAPStorage storage = ASAPEngineFS.getASAPStorage(owner, appFolderName, format);
+            ASAPStorage storage = ASAPEngineFS.getASAPStorage(owner, appFolderName, appName);
             if(!storage.isASAPManagementStorageSet()) {
                 storage.setASAPManagementStorage(ASAPEngineFS.getASAPStorage(owner,
                         TESTS_ROOT_FOLDER + "/" + owner + "/ASAPManagement",
                         ASAP_1_0.ASAP_MANAGEMENT_FORMAT));
             }
 
-            if(recipients.size() > 0) {
-                storage.createChannel(uri, recipients);
+            this.storages.put(this.getStorageKey(owner, appName), storage);
+        }
+        catch(RuntimeException e) {
+            this.printUsage(CREATE_ASAP_APP, e.getLocalizedMessage());
+        } catch (IOException | ASAPException e) {
+            this.printUsage(CREATE_ASAP_APP, e.getLocalizedMessage());
+        }
+    }
+
+    public void doCreateASAPChannel(String parameterString) {
+        StringTokenizer st = new StringTokenizer(parameterString);
+
+        try {
+            String owner = st.nextToken();
+            String appName = st.nextToken();
+            String uri = st.nextToken();
+
+            ASAPStorage storage = this.storages.get(this.getStorageKey(owner, appName));
+
+            List<CharSequence> recipients = new ArrayList<>();
+
+            // one recipient is mandatory - provoke an exception otherwise
+            recipients.add(st.nextToken());
+
+            // optional recipients
+            while(st.hasMoreTokens()) {
+                recipients.add(st.nextToken());
             }
 
-            this.storages.put(this.getStorageKey(owner, appName), storage);
+            storage.createChannel(uri, recipients);
         }
         catch(RuntimeException e) {
-            this.printUsage(CREATE_ASAP_STORAGE, e.getLocalizedMessage());
+            this.printUsage(CREATE_ASAP_APP, e.getLocalizedMessage());
         } catch (IOException | ASAPException e) {
-            this.printUsage(CREATE_ASAP_STORAGE, e.getLocalizedMessage());
+            this.printUsage(CREATE_ASAP_APP, e.getLocalizedMessage());
         }
     }
 

test/net/sharksystem/asap/MultihopTests.java

@@ -21,9 +21,9 @@ public void twoHops() throws IOException, ASAPException, InterruptedException {
         ui.doResetASAPStorages();
 
         // create storages
-        ui.doCreateASAPChannel("Alice twoHops sn2://abc");
-        ui.doCreateASAPChannel("Bob twoHops sn2://abc");
-        ui.doCreateASAPChannel("Clara twoHops sn2://abc");
+        ui.doCreateASAPApp("Alice twoHops");
+        ui.doCreateASAPApp("Bob twoHops");
+        ui.doCreateASAPApp("Clara twoHops");
 
         ui.doSetSendReceivedMessage("Alice:twoHops on");
         ui.doSetSendReceivedMessage("Bob:twoHops on");
@@ -98,6 +98,12 @@ public void createNonOpenStorage() throws IOException, ASAPException, Interrupte
         CmdLineUI ui = new CmdLineUI(System.out);
         ui.doResetASAPStorages();
 
+        // create app on each peer
+        ui.doCreateASAPApp("Alice chat");
+        ui.doCreateASAPApp("Bob chat");
+        ui.doCreateASAPApp("Clara chat");
+
+        // create closed channel with Alice
         ui.doCreateASAPChannel(" Alice chat sn2://closedChannel Bob Clara");
         ui.doPrintChannelInformation("Alice chat sn2://closedChannel");