X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain-afb-client-demo.c;h=4b3ce4b7f8e662fb9c4ffa49017e353506b86cfd;hb=0342cd1f15478365bad504d9398d56a03b89781a;hp=bd0bbc40c2c299d524cf2927a21577c5ba9e5828;hpb=26286eb5a7af0b58ec602afda45eb021cc21d104;p=src%2Fapp-framework-binder.git diff --git a/src/main-afb-client-demo.c b/src/main-afb-client-demo.c index bd0bbc40..4b3ce4b7 100644 --- a/src/main-afb-client-demo.c +++ b/src/main-afb-client-demo.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2018 "IoT.bzh" + * Copyright (C) 2015-2019 "IoT.bzh" * Author "Fulup Ar Foll" * Author José Bollo * @@ -30,11 +30,24 @@ #include #include +#if !defined(JSON_C_TO_STRING_NOSLASHESCAPE) +#define JSON_C_TO_STRING_NOSLASHESCAPE 0 +#endif #include "afb-wsj1.h" #include "afb-ws-client.h" #include "afb-proto-ws.h" +enum { + Exit_Success = 0, + Exit_Error = 1, + Exit_HangUp = 2, + Exit_Input_Fail = 3, + Exit_Bad_Arg = 4, + Exit_Cant_Connect = 5 +}; + + /* declaration of functions */ static void on_wsj1_hangup(void *closure, struct afb_wsj1 *wsj1); static void on_wsj1_call(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg); @@ -90,6 +103,7 @@ static int usein; static sd_event *loop; static sd_event_source *evsrc; static char *sessionid = "afb-client-demo"; +static int exitcode = 0; /* print usage of the program */ static void usage(int status, char *arg0) @@ -106,8 +120,9 @@ static void usage(int status, char *arg0) " --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\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" "Example:\n" " %s --human 'localhost:1234/api?token=HELLO&uuid=magic' hello ping\n" "\n", name @@ -120,44 +135,50 @@ static void usage(int status, char *arg0) int main(int ac, char **av, char **env) { int rc; - char *a0; + char *a0, *an; /* get the program name */ a0 = av[0]; /* check options */ - while (ac > 1 && av[1][0] == '-') { - if (av[1][1] == '-') { + while (ac > 1 && (an = av[1])[0] == '-') { + if (an[1] == '-') { /* long option */ - if (!strcmp(av[1], "--human")) /* request for human output */ + if (!strcmp(an, "--human")) /* request for human output */ human = 1; - else if (!strcmp(av[1], "--raw")) /* request for raw output */ + else if (!strcmp(an, "--raw")) /* request for raw output */ raw = 1; - else if (!strcmp(av[1], "--direct")) /* request for direct api */ + else if (!strcmp(an, "--direct")) /* request for direct api */ direct = 1; - else if (!strcmp(av[1], "--break")) /* request to break connection */ + else if (!strcmp(an, "--break")) /* request to break connection */ breakcon = 1; - else if (!strcmp(av[1], "--keep-running")) /* request to break connection */ + else if (!strcmp(an, "--keep-running")) /* request to break connection */ keeprun = 1; - else if (!strcmp(av[1], "--sync")) /* request to break connection */ + else if (!strcmp(an, "--sync")) /* request to break connection */ synchro = 1; - else if (!strcmp(av[1], "--echo")) /* request to echo inputs */ + else if (!strcmp(an, "--echo")) /* request to echo inputs */ echo = 1; + else if (!strcmp(an, "--pipe") && av[2] && atoi(av[2]) > 0) { + synchro = atoi(av[2]); + av++; + ac--; + } + /* emit usage and exit */ else - usage(!!strcmp(av[1], "--help"), a0); + usage(strcmp(an, "--help") ? Exit_Bad_Arg : Exit_Success, a0); } else { /* short option(s) */ - for (rc = 1 ; av[1][rc] ; rc++) - switch (av[1][rc]) { + for (rc = 1 ; an[rc] ; rc++) + switch (an[rc]) { case 'H': human = 1; break; case 'r': raw = 1; break; case 'd': direct = 1; break; @@ -165,7 +186,8 @@ int main(int ac, char **av, char **env) case 'k': keeprun = 1; break; case 's': synchro = 1; break; case 'e': echo = 1; break; - default: usage(av[1][rc] != 'h', a0); + 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); } } av++; @@ -192,14 +214,14 @@ int main(int ac, char **av, char **env) pws = afb_ws_client_connect_api(loop, av[1], &pws_itf, NULL); if (pws == NULL) { fprintf(stderr, "connection to %s failed: %m\n", av[1]); - return 1; + return Exit_Cant_Connect; } afb_proto_ws_on_hangup(pws, on_pws_hangup); } else { wsj1 = afb_ws_client_connect_wsj1(loop, av[1], &wsj1_itf, NULL); if (wsj1 == NULL) { fprintf(stderr, "connection to %s failed: %m\n", av[1]); - return 1; + return Exit_Cant_Connect; } } @@ -230,10 +252,10 @@ static void idle() for(;;) { if (!usein) { if (!keeprun && !callcount) - exit(0); + exit(exitcode); sd_event_run(loop, 30000000); } - else if (!synchro || !callcount) { + else if (!synchro || callcount < synchro) { if (!process_stdin() && usein) sd_event_run(loop, 100000); } else { @@ -247,7 +269,7 @@ static void dec_callcount() { callcount--; if (exonrep && !callcount) - exit(0); + exit(exitcode); } /* called when wsj1 hangsup */ @@ -255,7 +277,7 @@ static void on_wsj1_hangup(void *closure, struct afb_wsj1 *wsj1) { printf("ON-HANGUP\n"); fflush(stdout); - exit(0); + exit(Exit_HangUp); } /* called when wsj1 receives a method invocation */ @@ -267,7 +289,7 @@ static void on_wsj1_call(void *closure, const char *api, const char *verb, struc if (human) printf("ON-CALL %s/%s:\n%s\n", api, verb, json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg), - JSON_C_TO_STRING_PRETTY)); + JSON_C_TO_STRING_PRETTY|JSON_C_TO_STRING_NOSLASHESCAPE)); fflush(stdout); rc = afb_wsj1_reply_error_s(msg, "\"unimplemented\"", NULL); if (rc < 0) @@ -282,20 +304,22 @@ static void on_wsj1_event(void *closure, const char *event, struct afb_wsj1_msg if (human) printf("ON-EVENT %s:\n%s\n", event, json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg), - JSON_C_TO_STRING_PRETTY)); + JSON_C_TO_STRING_PRETTY|JSON_C_TO_STRING_NOSLASHESCAPE)); fflush(stdout); } /* called when wsj1 receives a reply */ static void on_wsj1_reply(void *closure, struct afb_wsj1_msg *msg) { + int iserror = !afb_wsj1_msg_is_reply_ok(msg); + exitcode = iserror ? Exit_Error : Exit_Success; if (raw) printf("%s\n", afb_wsj1_msg_object_s(msg)); if (human) printf("ON-REPLY %s: %s\n%s\n", (char*)closure, - afb_wsj1_msg_is_reply_ok(msg) ? "OK" : "ERROR", + iserror ? "ERROR" : "OK", json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg), - JSON_C_TO_STRING_PRETTY)); + JSON_C_TO_STRING_PRETTY|JSON_C_TO_STRING_NOSLASHESCAPE)); fflush(stdout); free(closure); dec_callcount(); @@ -374,18 +398,18 @@ static int process_stdin() if (errno == EAGAIN) return 0; fprintf(stderr, "read error: %m\n"); - exit(1); + exit(Exit_Input_Fail); } if (rc == 0) { usein = count != 0; if (!usein && !keeprun) { if (!callcount) - exit(0); + exit(exitcode); exonrep = 1; } } count += (size_t)rc; - if (synchro && callcount) + if (synchro && callcount >= synchro) return 0; /* normalise the buffer content */ @@ -428,7 +452,7 @@ static int process_stdin() count -= pos; if (count == sizeof line) { fprintf(stderr, "overflow\n"); - exit(1); + exit(Exit_Input_Fail); } if (count) memmove(line, line + pos, count); @@ -449,6 +473,8 @@ static int on_stdin(sd_event_source *src, int fd, uint32_t revents, void *closur static void on_pws_reply(void *closure, void *request, struct json_object *result, const char *error, const char *info) { + int iserror = !!error; + exitcode = iserror ? Exit_Error : Exit_Success; error = error ?: "success"; if (raw) { /* TODO: transitionnal: fake the structured response */ @@ -461,11 +487,11 @@ static void on_pws_reply(void *closure, void *request, struct json_object *resul if (result) json_object_object_add(x, "response", json_object_get(result)); - printf("%s\n", json_object_to_json_string(x)); + printf("%s\n", json_object_to_json_string_ext(x, JSON_C_TO_STRING_NOSLASHESCAPE)); json_object_put(x); } if (human) - printf("ON-REPLY %s: %s %s\n%s\n", (char*)request, error, info ?: "", json_object_to_json_string_ext(result, JSON_C_TO_STRING_PRETTY)); + printf("ON-REPLY %s: %s %s\n%s\n", (char*)request, error, info ?: "", json_object_to_json_string_ext(result, JSON_C_TO_STRING_PRETTY|JSON_C_TO_STRING_NOSLASHESCAPE)); fflush(stdout); free(request); dec_callcount(); @@ -498,18 +524,18 @@ static void on_pws_event_unsubscribe(void *closure, void *request, const char *e static void on_pws_event_push(void *closure, const char *event_name, int 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, 0)); + 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)); 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)); + 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)); fflush(stdout); } static void on_pws_event_broadcast(void *closure, const char *event_name, struct json_object *data) { if (raw) - printf("ON-EVENT-BROADCAST: [%s]\n%s\n", event_name, json_object_to_json_string_ext(data, 0)); + printf("ON-EVENT-BROADCAST: [%s]\n%s\n", event_name, json_object_to_json_string_ext(data, JSON_C_TO_STRING_NOSLASHESCAPE)); if (human) - printf("ON-EVENT-BROADCAST: [%s]\n%s\n", event_name, json_object_to_json_string_ext(data, JSON_C_TO_STRING_PRETTY)); + printf("ON-EVENT-BROADCAST: [%s]\n%s\n", event_name, json_object_to_json_string_ext(data, JSON_C_TO_STRING_PRETTY|JSON_C_TO_STRING_NOSLASHESCAPE)); fflush(stdout); } @@ -520,6 +546,7 @@ static void pws_call(const char *verb, const char *object) char *key; int rc; struct json_object *o; + enum json_tokener_error jerr; /* allocates an id for the request */ rc = asprintf(&key, "%d:%s", ++num, verb); @@ -530,11 +557,11 @@ static void pws_call(const char *verb, const char *object) /* send the request */ callcount++; - if (object == NULL || object[0] == 0 || !strcmp(object, "null")) + if (object == NULL || object[0] == 0) o = NULL; else { - o = json_tokener_parse(object); - if (!o) + o = json_tokener_parse_verbose(object, &jerr); + if (jerr != json_tokener_success) o = json_object_new_string(object); } rc = afb_proto_ws_client_call(pws, verb, o, sessionid, key, NULL); @@ -552,5 +579,5 @@ static void on_pws_hangup(void *closure) { printf("ON-HANGUP\n"); fflush(stdout); - exit(0); + exit(Exit_HangUp); }