Merged in sandervrijders/ouroboros/be-gpb (pull request #45)

Replace custom ser/des with GPB

1 files changed, 16 insertions, 16 deletions

diff --git a/src/tools/irm/irm_register_ipcp.c b/src/tools/irm/irm_register_ipcp.c
index 468ef28f..b8808ecd 100644
--- a/src/tools/irm/irm_register_ipcp.c
+++ b/src/tools/irm/irm_register_ipcp.c
@@ -45,36 +45,36 @@ static void usage()
 
 int do_register_ipcp(int argc, char ** argv)
 {
-        rina_name_t name;
         char * difs[MAX_DIFS];
         size_t difs_size = 0;
-
-        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, "dif") == 0) {
-                                difs[difs_size++] = *(argv + 1);
-                                if (difs_size > MAX_DIFS) {
-                                        printf("Too many difs specified\n");
-                                        return -1;
-                                }
-                        } else {
-                                printf("\"%s\" is unknown, try \"irm "
-                                       "register_ipcp\".\n", *argv);
+                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) {
+                        difs[difs_size++] = *(argv + 1);
+                        if (difs_size > MAX_DIFS) {
+                                printf("Too many difs specified\n");
                                 return -1;
                         }
+                } else {
+                        printf("\"%s\" is unknown, try \"irm "
+                               "register_ipcp\".\n", *argv);
+                        return -1;
                 }
 
                 argc -= 2;
                 argv += 2;
         }
 
-        if (difs_size == 0 || name.ap_name == NULL) {
+        if (difs_size == 0 || ap_name == NULL) {
                 usage();
                 return -1;
         }
 
-        return irm_reg_ipcp(name, difs, difs_size);
+        return irm_reg_ipcp(ap_name, api_id, difs, difs_size);
 }