lib: Update irm.h API

Removes rina_name_t from that API. Passing ap_name and api_id as
params instead. The IRM tool has been updated accordingly. Some errors
in the build related to protobuf-c have also been resolved.

1 files changed, 10 insertions, 7 deletions

diff --git a/src/tools/irm/irm_destroy_ipcp.c b/src/tools/irm/irm_destroy_ipcp.c
index 4f02f9cb..fbbeb5bd 100644
--- a/src/tools/irm/irm_destroy_ipcp.c
+++ b/src/tools/irm/irm_destroy_ipcp.c
@@ -21,6 +21,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <ouroboros/irm.h>
 #include <ouroboros/common.h>
 
@@ -36,13 +37,15 @@ static void usage()
 
 int do_destroy_ipcp(int argc, char ** argv)
 {
-        rina_name_t name;
-
-        name.ap_name = NULL;
-        name.api_id = 0;
+        char * ap_name = NULL;
+        int api_id = 0;
 
         while (argc > 0) {
-                if (!parse_name(argv, &name)) {
+                if (matches(*argv, "ap") == 0) {
+                        ap_name = *(argv + 1);
+                } else if (matches(*argv, "api") == 0) {
+                        api_id = atoi(*(argv + 1));
+                } else {
                         printf("\"%s\" is unknown, try \"irm "
                                "destroy_ipcp\".\n", *argv);
                         return -1;
@@ -52,10 +55,10 @@ int do_destroy_ipcp(int argc, char ** argv)
                 argv += 2;
         }
 
-        if (name.ap_name == NULL) {
+        if (ap_name == NULL) {
                 usage();
                 return -1;
         }
 
-        return irm_destroy_ipcp(name);
+        return irm_destroy_ipcp(ap_name, api_id);
 }