From 72abee4fc44e5e5092e215d5afee556e6e59347c Mon Sep 17 00:00:00 2001 From: Sander Vrijders Date: Thu, 24 Mar 2016 15:46:05 +0100 Subject: lib: Adds IRMd messages for the dev.h API calls This adds several messages for the dev.h API calls to communicate with the IRM daemon. The deserializing of these messages is still missing and the irmd hasn't been updated with them either. --- src/tools/echo/echo_client.c | 5 ++--- src/tools/echo/echo_server.c | 4 ++-- src/tools/irm/irm_bootstrap_ipcp.c | 6 +----- src/tools/irm/irm_create_ipcp.c | 4 ---- src/tools/irm/irm_destroy_ipcp.c | 6 +----- src/tools/irm/irm_enroll_ipcp.c | 4 ---- src/tools/irm/irm_register_ipcp.c | 4 ---- src/tools/irm/irm_unregister_ipcp.c | 4 ---- src/tools/irm/irm_utils.c | 4 ---- 9 files changed, 6 insertions(+), 35 deletions(-) (limited to 'src/tools') diff --git a/src/tools/echo/echo_client.c b/src/tools/echo/echo_client.c index 2f80a52a..196296f2 100644 --- a/src/tools/echo/echo_client.c +++ b/src/tools/echo/echo_client.c @@ -33,9 +33,8 @@ int client_main() char * message = "Client says hi!"; ssize_t count = 0; - fd = flow_alloc(SERVER_AP_NAME, NULL, - CLIENT_AP_NAME, NULL, - NULL, 0); + fd = flow_alloc(SERVER_AP_NAME, CLIENT_AP_NAME, + NULL, NULL, 0); if (fd < 0) { printf("Failed to allocate flow\n"); return -1; diff --git a/src/tools/echo/echo_server.c b/src/tools/echo/echo_server.c index f9682ab7..289f537a 100644 --- a/src/tools/echo/echo_server.c +++ b/src/tools/echo/echo_server.c @@ -34,7 +34,7 @@ void shutdown_server(int signo) { char * dif = DIF_NAME; - if (ap_unreg(SERVER_AP_NAME, NULL, &dif, 1)) { + if (ap_unreg(SERVER_AP_NAME, &dif, 1)) { printf("Failed to unregister application\n"); exit(EXIT_FAILURE); } @@ -59,7 +59,7 @@ int server_main() return -1; } - server_fd = ap_reg(SERVER_AP_NAME, NULL, &dif, 1); + server_fd = ap_reg(SERVER_AP_NAME, &dif, 1); if (server_fd < 0) { printf("Failed to register application\n"); return -1; diff --git a/src/tools/irm/irm_bootstrap_ipcp.c b/src/tools/irm/irm_bootstrap_ipcp.c index 8c64ba8f..89950069 100644 --- a/src/tools/irm/irm_bootstrap_ipcp.c +++ b/src/tools/irm/irm_bootstrap_ipcp.c @@ -32,9 +32,7 @@ static void usage() /* FIXME: Add dif_config stuff */ printf("Usage: irm bootstrap_ipcp\n" " ap \n" - " [api ]\n" - " [ae ]\n"); + " [api ]\n"); } @@ -47,8 +45,6 @@ int do_bootstrap_ipcp(int argc, char ** argv) name.ap_name = NULL; name.api_id = 0; - name.ae_name = ""; - name.aei_id = 0; while (argc > 0) { if (!parse_name(argv, &name)) { diff --git a/src/tools/irm/irm_create_ipcp.c b/src/tools/irm/irm_create_ipcp.c index 5c847988..854a15f9 100644 --- a/src/tools/irm/irm_create_ipcp.c +++ b/src/tools/irm/irm_create_ipcp.c @@ -35,8 +35,6 @@ static void usage() printf("Usage: irm create_ipcp\n" " ap \n" " [api ]\n" - " [ae ]\n" " type \n"); } @@ -47,8 +45,6 @@ int do_create_ipcp(int argc, char ** argv) name.ap_name = NULL; name.api_id = 0; - name.ae_name = ""; - name.aei_id = 0; while (argc > 0) { if (!parse_name(argv, &name)) { diff --git a/src/tools/irm/irm_destroy_ipcp.c b/src/tools/irm/irm_destroy_ipcp.c index 467d1b50..4f02f9cb 100644 --- a/src/tools/irm/irm_destroy_ipcp.c +++ b/src/tools/irm/irm_destroy_ipcp.c @@ -31,9 +31,7 @@ static void usage() { printf("Usage: irm destroy_ipcp\n" " ap \n" - " [api ]\n" - " [ae ]\n"); + " [api ]\n"); } int do_destroy_ipcp(int argc, char ** argv) @@ -42,8 +40,6 @@ int do_destroy_ipcp(int argc, char ** argv) name.ap_name = NULL; name.api_id = 0; - name.ae_name = ""; - name.aei_id = 0; while (argc > 0) { if (!parse_name(argv, &name)) { diff --git a/src/tools/irm/irm_enroll_ipcp.c b/src/tools/irm/irm_enroll_ipcp.c index 94f28f82..1dcdc919 100644 --- a/src/tools/irm/irm_enroll_ipcp.c +++ b/src/tools/irm/irm_enroll_ipcp.c @@ -32,8 +32,6 @@ static void usage() printf("Usage: irm enroll_ipcp\n" " ap \n" " [api ]\n" - " [ae ]\n" " dif \n"); } @@ -44,8 +42,6 @@ int do_enroll_ipcp(int argc, char ** argv) name.ap_name = NULL; name.api_id = 0; - name.ae_name = ""; - name.aei_id = 0; while (argc > 0) { if (!parse_name(argv, &name)) { diff --git a/src/tools/irm/irm_register_ipcp.c b/src/tools/irm/irm_register_ipcp.c index c69ad350..468ef28f 100644 --- a/src/tools/irm/irm_register_ipcp.c +++ b/src/tools/irm/irm_register_ipcp.c @@ -37,8 +37,6 @@ static void usage() printf("Usage: irm register_ipcp\n" " ap \n" " [api ]\n" - " [ae ]\n" " dif \n" " [dif ]\n" " [... (maximum %d difs)]\n", MAX_DIFS); @@ -53,8 +51,6 @@ int do_register_ipcp(int argc, char ** argv) name.ap_name = NULL; name.api_id = 0; - name.ae_name = ""; - name.aei_id = 0; while (argc > 0) { if (!parse_name(argv, &name)) { diff --git a/src/tools/irm/irm_unregister_ipcp.c b/src/tools/irm/irm_unregister_ipcp.c index a2dffc6c..0b669503 100644 --- a/src/tools/irm/irm_unregister_ipcp.c +++ b/src/tools/irm/irm_unregister_ipcp.c @@ -37,8 +37,6 @@ static void usage() printf("Usage: irm unregister_ipcp\n" " ap \n" " [api ]\n" - " [ae ]\n" " dif \n" " [dif ]\n" " [... (maximum %d difs)]\n", MAX_DIFS); @@ -53,8 +51,6 @@ int do_unregister_ipcp(int argc, char ** argv) name.ap_name = NULL; name.api_id = 0; - name.ae_name = ""; - name.aei_id = 0; while (argc > 0) { if (!parse_name(argv, &name)) { diff --git a/src/tools/irm/irm_utils.c b/src/tools/irm/irm_utils.c index 021227fd..04cb7242 100644 --- a/src/tools/irm/irm_utils.c +++ b/src/tools/irm/irm_utils.c @@ -47,10 +47,6 @@ bool parse_name(char ** argv, name->ap_name = *(argv + 1); else if (matches(*argv, "api") == 0) name->api_id = atoi(*(argv + 1)); - else if (matches(*argv, "ae") == 0) - name->ae_name = *(argv + 1); - else if (matches(*argv, "aei") == 0) - name->aei_id = atoi(*(argv + 1)); else found = false; -- cgit v1.2.3