From a14d696bdbc72754e8019fa9579d5a338cc85a05 Mon Sep 17 00:00:00 2001
From: Sander Vrijders <sander.vrijders@intec.ugent.be>
Date: Mon, 28 Mar 2016 14:43:16 +0200
Subject: 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.
---
 src/tools/irm/irm_enroll_ipcp.c | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'src/tools/irm/irm_enroll_ipcp.c')

diff --git a/src/tools/irm/irm_enroll_ipcp.c b/src/tools/irm/irm_enroll_ipcp.c
index 1dcdc919..70798821 100644
--- a/src/tools/irm/irm_enroll_ipcp.c
+++ b/src/tools/irm/irm_enroll_ipcp.c
@@ -21,6 +21,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <ouroboros/irm.h>
 #include <ouroboros/common.h>
 
@@ -37,31 +38,31 @@ static void usage()
 
 int do_enroll_ipcp(int argc, char ** argv)
 {
-        rina_name_t name;
+        char * ap_name = NULL;
+        int api_id = 0;
         char * dif_name = NULL;
 
-        name.ap_name = NULL;
-        name.api_id = 0;
-
         while (argc > 0) {
-                if (!parse_name(argv, &name)) {
-                        if (matches(*argv, "dif") == 0) {
-                                dif_name = *(argv + 1);
-                        } else {
-                                printf("\"%s\" is unknown, try \"irm "
-                                       "enroll_ipcp\".\n", *argv);
-                                return -1;
-                        }
+                if (matches(*argv, "ap") == 0) {
+                        ap_name = *(argv + 1);
+                } else if (matches(*argv, "api") == 0) {
+                        api_id = atoi(*(argv + 1));
+                } else if (matches(*argv, "dif") == 0) {
+                        dif_name = *(argv + 1);
+                } else {
+                        printf("\"%s\" is unknown, try \"irm "
+                               "enroll_ipcp\".\n", *argv);
+                        return -1;
                 }
 
                 argc -= 2;
                 argv += 2;
         }
 
-        if (dif_name == NULL || name.ap_name == NULL) {
+        if (dif_name == NULL || ap_name == NULL) {
                 usage();
                 return -1;
         }
 
-        return irm_enroll_ipcp(name, dif_name);
+        return irm_enroll_ipcp(ap_name, api_id, dif_name);
 }
-- 
cgit v1.2.3