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, 14 insertions, 14 deletions

diff --git a/src/tools/irm/irm_create_ipcp.c b/src/tools/irm/irm_create_ipcp.c
index 854a15f9..3262bd5c 100644
--- a/src/tools/irm/irm_create_ipcp.c
+++ b/src/tools/irm/irm_create_ipcp.c
@@ -40,31 +40,31 @@ static void usage()
 
 int do_create_ipcp(int argc, char ** argv)
 {
-        rina_name_t name;
         char * ipcp_type = NULL;
-
-        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, "type") == 0) {
-                                ipcp_type = *(argv + 1);
-                        } else {
-                                printf("\"%s\" is unknown, try \"irm "
-                                       "create_ipcp\".\n", *argv);
-                                return -1;
-                        }
+                if (matches(*argv, "type") == 0) {
+                        ipcp_type = *(argv + 1);
+                } else 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 "
+                               "create_ipcp\".\n", *argv);
+                        return -1;
                 }
 
                 argc -= 2;
                 argv += 2;
         }
 
-        if (ipcp_type == NULL || name.ap_name == NULL) {
+        if (ipcp_type == NULL || ap_name == NULL) {
                 usage();
                 return -1;
         }
 
-        return irm_create_ipcp(name, ipcp_type);
+        return irm_create_ipcp(ap_name, api_id, ipcp_type);
 }