lib, irmd, ipcpd: Change of IRM API

This changes the IRM API after discussions with Dimitri. The register
operation is now split into a bind and register operation. The same
for unregister; unbind and unregister. PIDs are now used as the
application instance name. A name for a PID is only provided for
scriptability in bash. It is therefore also no longer passed down to
the IPCP. Every operation on an IPCP through the IRM API has to use
the PID. Quering of the PIDs by name is possible. The IRM tool has
been updated to use this new API as well. A subcommand 'ipcp' has been
added for operations that take effect on IPCPs only.

Fixes #12

1 files changed, 6 insertions, 47 deletions

diff --git a/src/tools/irm/irm_unregister.c b/src/tools/irm/irm_unregister.c
index d778e285..edcd42bb 100644
--- a/src/tools/irm/irm_unregister.c
+++ b/src/tools/irm/irm_unregister.c
@@ -1,7 +1,7 @@
 /*
  * Ouroboros - Copyright (C) 2016
  *
- * Unregister IPC Processes in an N-1 DIF
+ * Unregister names from IPCPs
  *
  *    Dimitri Staessens <[email protected]>
  *    Sander Vrijders   <[email protected]>
@@ -21,15 +21,10 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <ouroboros/config.h>
 #include <stdio.h>
-#include <ouroboros/irm.h>
-#include <ouroboros/common.h>
-#include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <signal.h>
+
+#include <ouroboros/irm.h>
 
 #include "irm_ops.h"
 #include "irm_utils.h"
@@ -39,40 +34,22 @@
 static void usage()
 {
         printf("Usage: irm unregister\n"
-               "           [name <name>]\n"
-               "           [apn <application process name>]\n"
-               "           [api <application process instance>]\n"
+               "           name <name>\n"
                "           dif <dif name to unregister from>\n"
                "           [dif <dif name to unregister from>]\n"
                "           [... (maximum %d difs)]\n"
-               "           [hard] (unregisters everything using that name)\n"
                , MAX_DIFS);
 }
 
 int do_unregister(int argc, char ** argv)
 {
-        instance_name_t api = {NULL, 0};
         char * difs[MAX_DIFS];
         size_t difs_len = 0;
         char * name = NULL;
-        bool hard_opt = false;
-        bool ap_id = false;
-        instance_name_t * ptr_api = NULL;
 
         while (argc > 0) {
                 if (matches(*argv, "name") == 0) {
                         name = *(argv + 1);
-                } else if (matches(*argv, "ap") == 0) {
-                        api.name = *(argv + 1);
-                        ptr_api = &api;
-                } else if (matches(*argv, "api") == 0) {
-                        api.id = atoi(*(argv + 1));
-                        ap_id = true;
-                } else if (strcmp(*argv, "hard") == 0) {
-                        hard_opt = true;
-                        /* this has no value */
-                        ++argc;
-                        --argv;
                 } else if (matches(*argv, "dif") == 0) {
                         difs[difs_len++] = *(argv + 1);
                         if (difs_len > MAX_DIFS) {
@@ -89,28 +66,10 @@ int do_unregister(int argc, char ** argv)
                 argv += 2;
         }
 
-        if (difs_len == 0) {
-                usage();
-                return -1;
-        }
-
-        if (name == NULL && api.name == NULL) {
-                printf("apn or name must be set.\n");
-                usage();
-                return -1;
-        }
-
-        if (ap_id && api.name == NULL) {
-                printf("api requires apn.\n");
-                usage();
-                return -1;
-        }
-
-        if (hard_opt && api.name != NULL) {
-                printf("apn and/or api must not be set when using hard.\n");
+        if (difs_len == 0 || name == NULL) {
                 usage();
                 return -1;
         }
 
-        return irm_unreg(name, ptr_api, difs, difs_len, hard_opt);
+        return irm_unreg(name, difs, difs_len);
 }