X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain-afb-client-demo.c;h=7467e094ce8a04067f1ee29a6094882a96f33a30;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=f2c0826e2ed709be014dc024f20928896a50d0c4;hpb=6dfeafe7e4fa582b3db3f950136bc97f8611fc6d;p=src%2Fapp-framework-binder.git diff --git a/src/main-afb-client-demo.c b/src/main-afb-client-demo.c index f2c0826e..7467e094 100644 --- a/src/main-afb-client-demo.c +++ b/src/main-afb-client-demo.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2019 "IoT.bzh" + * Copyright (C) 2015-2020 "IoT.bzh" * Author "Fulup Ar Foll" * Author José Bollo * @@ -55,11 +55,11 @@ static void on_wsj1_event(void *closure, const char *event, struct afb_wsj1_msg static void on_pws_hangup(void *closure); static void on_pws_reply(void *closure, void *request, struct json_object *result, const char *error, const char *info); -static void on_pws_event_create(void *closure, const char *event_name, int event_id); -static void on_pws_event_remove(void *closure, const char *event_name, int event_id); -static void on_pws_event_subscribe(void *closure, void *request, const char *event_name, int event_id); -static void on_pws_event_unsubscribe(void *closure, void *request, const char *event_name, int event_id); -static void on_pws_event_push(void *closure, const char *event_name, int event_id, struct json_object *data); +static void on_pws_event_create(void *closure, uint16_t event_id, const char *event_name); +static void on_pws_event_remove(void *closure, uint16_t event_id); +static void on_pws_event_subscribe(void *closure, void *request, uint16_t event_id); +static void on_pws_event_unsubscribe(void *closure, void *request, uint16_t event_id); +static void on_pws_event_push(void *closure, uint16_t event_id, struct json_object *data); static void on_pws_event_broadcast(void *closure, const char *event_name, struct json_object *data, const afb_proto_ws_uuid_t uuid, uint8_t hop); static void idle(); @@ -102,7 +102,11 @@ static int synchro; static int usein; static sd_event *loop; static sd_event_source *evsrc; -static char *sessionid = "afb-client-demo"; +static char *uuid; +static char *token; +static uint16_t numuuid; +static uint16_t numtoken; +static char *url; static int exitcode = 0; /* print usage of the program */ @@ -110,19 +114,21 @@ static void usage(int status, char *arg0) { char *name = strrchr(arg0, '/'); name = name ? name + 1 : arg0; - fprintf(status ? stderr : stdout, "usage: %s [-H [-r]] [-b] [-e] uri [api verb [data]]\n", name); - fprintf(status ? stderr : stdout, " %s -d [-H [-r]] [-b] [-e] uri [verb [data]]\n", name); + fprintf(status ? stderr : stdout, "usage: %s [options]... uri [api verb [data]]\n", name); + fprintf(status ? stderr : stdout, " %s -d [options]... uri [verb [data]]\n", name); fprintf(status ? stderr : stdout, "\n" "allowed options\n" - " --break, -b Break connection just after event/call has been emitted.\n" - " --direct, -d Direct api\n" - " --echo, -e Echo inputs\n" - " --help, -h Display this help\n" - " --human, -H Display human readable JSON\n" - " --raw, -r Raw output (default)\n" - " --sync, -s Synchronous: wait for answers (like -p 1)\n" - " --keep-running, -k Keep running until disconnect, even if input closed\n" - " --pipe, -p COUNT Allow to pipe COUNT requests\n" + " -b, --break Break connection just after event/call has been emitted.\n" + " -d, --direct Direct api\n" + " -e, --echo Echo inputs\n" + " -h, --help Display this help\n" + " -H, --human Display human readable JSON\n" + " -k, --keep-running Keep running until disconnect, even if input closed\n" + " -p, --pipe COUNT Allow to pipe COUNT requests\n" + " -r, --raw Raw output (default)\n" + " -s, --sync Synchronous: wait for answers (like -p 1)\n" + " -t, --token TOKEN The token to use\n" + " -u, --uuid UUID The identifier of session to use\n" "Example:\n" " %s --human 'localhost:1234/api?token=HELLO&uuid=magic' hello ping\n" "\n", name @@ -171,7 +177,16 @@ int main(int ac, char **av, char **env) av++; ac--; } - + else if (!strcmp(an, "--token") && av[2]) { /* token to use */ + token = av[2]; + av++; + ac--; + } + else if (!strcmp(an, "--uuid") && av[2]) { /* session id to join */ + uuid = av[2]; + av++; + ac--; + } /* emit usage and exit */ else usage(strcmp(an, "--help") ? Exit_Bad_Arg : Exit_Success, a0); @@ -186,8 +201,12 @@ int main(int ac, char **av, char **env) case 'k': keeprun = 1; break; case 's': synchro = 1; break; case 'e': echo = 1; break; + case 't': if (!av[2]) usage(Exit_Bad_Arg, a0); token = av[2]; av++; ac--; break; + case 'u': if (!av[2]) usage(Exit_Bad_Arg, a0); uuid = av[2]; av++; ac--; break; case 'p': if (av[2] && atoi(av[2]) > 0) { synchro = atoi(av[2]); av++; ac--; break; } /*@fallthrough@*/ - default: usage(an[rc] != 'h' ? Exit_Bad_Arg : Exit_Success, a0); + default: + usage(an[rc] != 'h' ? Exit_Bad_Arg : Exit_Success, a0); + break; } } av++; @@ -217,8 +236,25 @@ int main(int ac, char **av, char **env) return Exit_Cant_Connect; } afb_proto_ws_on_hangup(pws, on_pws_hangup); + if (uuid) { + numuuid = 1; + afb_proto_ws_client_session_create(pws, numuuid, uuid); + } + if (token) { + numtoken = 1; + afb_proto_ws_client_token_create(pws, numtoken, token); + } } else { - wsj1 = afb_ws_client_connect_wsj1(loop, av[1], &wsj1_itf, NULL); + rc = asprintf(&url, "%s%s%s%s%s%s%s", + av[1], + uuid || token ? "?" : "", + uuid ? "uuid=" : "", + uuid ?: "", + uuid && token ? "&" : "", + token ? "token=" : "", + token ?: "" + ); + wsj1 = afb_ws_client_connect_wsj1(loop, url, &wsj1_itf, NULL); if (wsj1 == NULL) { fprintf(stderr, "connection to %s failed: %m\n", av[1]); return Exit_Cant_Connect; @@ -497,36 +533,36 @@ static void on_pws_reply(void *closure, void *request, struct json_object *resul dec_callcount(); } -static void on_pws_event_create(void *closure, const char *event_name, int event_id) +static void on_pws_event_create(void *closure, uint16_t event_id, const char *event_name) { printf("ON-EVENT-CREATE: [%d:%s]\n", event_id, event_name); fflush(stdout); } -static void on_pws_event_remove(void *closure, const char *event_name, int event_id) +static void on_pws_event_remove(void *closure, uint16_t event_id) { - printf("ON-EVENT-REMOVE: [%d:%s]\n", event_id, event_name); + printf("ON-EVENT-REMOVE: [%d]\n", event_id); fflush(stdout); } -static void on_pws_event_subscribe(void *closure, void *request, const char *event_name, int event_id) +static void on_pws_event_subscribe(void *closure, void *request, uint16_t event_id) { - printf("ON-EVENT-SUBSCRIBE %s: [%d:%s]\n", (char*)request, event_id, event_name); + printf("ON-EVENT-SUBSCRIBE %s: [%d]\n", (char*)request, event_id); fflush(stdout); } -static void on_pws_event_unsubscribe(void *closure, void *request, const char *event_name, int event_id) +static void on_pws_event_unsubscribe(void *closure, void *request, uint16_t event_id) { - printf("ON-EVENT-UNSUBSCRIBE %s: [%d:%s]\n", (char*)request, event_id, event_name); + printf("ON-EVENT-UNSUBSCRIBE %s: [%d]\n", (char*)request, event_id); fflush(stdout); } -static void on_pws_event_push(void *closure, const char *event_name, int event_id, struct json_object *data) +static void on_pws_event_push(void *closure, uint16_t event_id, struct json_object *data) { if (raw) - printf("ON-EVENT-PUSH: [%d:%s]\n%s\n", event_id, event_name, json_object_to_json_string_ext(data, JSON_C_TO_STRING_NOSLASHESCAPE)); + printf("ON-EVENT-PUSH: [%d]\n%s\n", event_id, json_object_to_json_string_ext(data, JSON_C_TO_STRING_NOSLASHESCAPE)); if (human) - printf("ON-EVENT-PUSH: [%d:%s]\n%s\n", event_id, event_name, json_object_to_json_string_ext(data, JSON_C_TO_STRING_PRETTY|JSON_C_TO_STRING_NOSLASHESCAPE)); + printf("ON-EVENT-PUSH: [%d]\n%s\n", event_id, json_object_to_json_string_ext(data, JSON_C_TO_STRING_PRETTY|JSON_C_TO_STRING_NOSLASHESCAPE)); fflush(stdout); } @@ -564,7 +600,7 @@ static void pws_call(const char *verb, const char *object) if (jerr != json_tokener_success) o = json_object_new_string(object); } - rc = afb_proto_ws_client_call(pws, verb, o, sessionid, key, NULL); + rc = afb_proto_ws_client_call(pws, verb, o, numuuid, numtoken, key, NULL); json_object_put(o); if (rc < 0) { fprintf(stderr, "calling %s(%s) failed: %m\n", verb, object?:"");