From a02d416c7e199a58dd75b7ec2a9ca45643ec393b Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Fri, 5 May 2017 10:58:01 +0200 Subject: Templates separation between binding API hat and Callbacks Change-Id: I4c405c0ae02f50f03f9b4e71ebbdcd74f51e4ac8 Signed-off-by: Romain Forlot --- templates/hybrid-html5/binding/xxx-cb.c | 29 +++ templates/hybrid-html5/binding/xxx-hat.c | 46 ++++ templates/hybrid-html5/binding/xxx-hat.h | 29 +++ .../hybrid-html5/binding/xxxxxx-hybrid-binding.c | 53 ---- templates/native/app/xxx-native-app.c | 242 ++++++++++++++++++ templates/native/app/xxxxxx-native-client.c | 242 ------------------ templates/service/binding/xxx-service-cb.c | 241 ++++++++++++++++++ templates/service/binding/xxx-service-hat.c | 58 +++++ templates/service/binding/xxx-service-hat.h | 78 ++++++ templates/service/binding/xxxxxx-service-binding.c | 279 --------------------- 10 files changed, 723 insertions(+), 574 deletions(-) create mode 100644 templates/hybrid-html5/binding/xxx-cb.c create mode 100644 templates/hybrid-html5/binding/xxx-hat.c create mode 100644 templates/hybrid-html5/binding/xxx-hat.h delete mode 100644 templates/hybrid-html5/binding/xxxxxx-hybrid-binding.c create mode 100644 templates/native/app/xxx-native-app.c delete mode 100644 templates/native/app/xxxxxx-native-client.c create mode 100644 templates/service/binding/xxx-service-cb.c create mode 100644 templates/service/binding/xxx-service-hat.c create mode 100644 templates/service/binding/xxx-service-hat.h delete mode 100644 templates/service/binding/xxxxxx-service-binding.c (limited to 'templates') diff --git a/templates/hybrid-html5/binding/xxx-cb.c b/templates/hybrid-html5/binding/xxx-cb.c new file mode 100644 index 0000000..12d7fa6 --- /dev/null +++ b/templates/hybrid-html5/binding/xxx-cb.c @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2015, 2016 "IoT.bzh" + * Author "Manuel Bachmann" + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#define _GNU_SOURCE +#include + +#include +#include "xxx-hat.h" + +void ping (struct afb_req request) +{ + static int pingcount = 0; + + json_object *query = afb_req_json(request); + afb_req_success_f(request, NULL, "Ping Binder Daemon count=%d query=%s", ++pingcount, json_object_to_json_string(query)); +} diff --git a/templates/hybrid-html5/binding/xxx-hat.c b/templates/hybrid-html5/binding/xxx-hat.c new file mode 100644 index 0000000..ffdc2c1 --- /dev/null +++ b/templates/hybrid-html5/binding/xxx-hat.c @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2015, 2016 "IoT.bzh" + * Author "Manuel Bachmann" + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#define _GNU_SOURCE +#include + +#include +#include "xxx-hat.h" + +const struct afb_binding_interface* interface; + +// NOTE: this sample does not use session to keep test a basic as possible +// in real application most APIs should be protected with AFB_SESSION_CHECK +static const struct afb_verb_desc_v1 verbs[]= { + {"ping" , AFB_SESSION_NONE, ping , "Ping the binder"}, + {NULL} +}; + +static const struct afb_binding plugin_desc = { + .type = AFB_BINDING_VERSION_1, + .v1 = { + .info = "xxxxxx hybrid service", + .prefix = "xxxxxx", + .verbs = verbs + } +}; + +const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf) +{ + interface = itf; + + return &plugin_desc; +} diff --git a/templates/hybrid-html5/binding/xxx-hat.h b/templates/hybrid-html5/binding/xxx-hat.h new file mode 100644 index 0000000..b4dd89e --- /dev/null +++ b/templates/hybrid-html5/binding/xxx-hat.h @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2015, 2016 "IoT.bzh" + * Author "Manuel Bachmann" + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #ifndef BINDINGHAT_H + #define BINDINGHAT_H + +#define _GNU_SOURCE +#include + +#include + +extern const struct afb_binding_interface *interface; + +void ping (struct afb_req request); + +#endif \ No newline at end of file diff --git a/templates/hybrid-html5/binding/xxxxxx-hybrid-binding.c b/templates/hybrid-html5/binding/xxxxxx-hybrid-binding.c deleted file mode 100644 index de6a78e..0000000 --- a/templates/hybrid-html5/binding/xxxxxx-hybrid-binding.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2015, 2016 "IoT.bzh" - * Author "Manuel Bachmann" - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#define _GNU_SOURCE -#include - -#include - -const struct afb_binding_interface *interface; - -static void ping (struct afb_req request) -{ - static int pingcount = 0; - - json_object *query = afb_req_json(request); - afb_req_success_f(request, NULL, "Ping Binder Daemon count=%d query=%s", ++pingcount, json_object_to_json_string(query)); -} - -// NOTE: this sample does not use session to keep test a basic as possible -// in real application most APIs should be protected with AFB_SESSION_CHECK -static const struct afb_verb_desc_v1 verbs[]= { - {"ping" , AFB_SESSION_NONE, ping , "Ping the binder"}, - {NULL} -}; - -static const struct afb_binding plugin_desc = { - .type = AFB_BINDING_VERSION_1, - .v1 = { - .info = "xxxxxx hybrid service", - .prefix = "xxxxxx", - .verbs = verbs - } -}; - -const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf) -{ - interface = itf; - - return &plugin_desc; -} diff --git a/templates/native/app/xxx-native-app.c b/templates/native/app/xxx-native-app.c new file mode 100644 index 0000000..312fd1a --- /dev/null +++ b/templates/native/app/xxx-native-app.c @@ -0,0 +1,242 @@ +/* + * Copyright (C) 2015, 2016 "IoT.bzh" + * Author "Fulup Ar Foll" + * Author José Bollo + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#define _GNU_SOURCE + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include + +/* declaration of functions */ +static void on_hangup(void *closure, struct afb_wsj1 *wsj1); +static void on_call(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg); +static void on_event(void *closure, const char *event, struct afb_wsj1_msg *msg); +static int io_event_callback(sd_event_source *src, int fd, uint32_t revents, void *closure); +static void emit(const char *api, const char *verb, const char *object); + +/* the callback interface for wsj1 */ +static struct afb_wsj1_itf itf = { + .on_hangup = on_hangup, + .on_call = on_call, + .on_event = on_event +}; + +/* global variables */ +static struct afb_wsj1 *wsj1; +static int exonrep; +static int callcount; +static sd_event_source *evsrc; + +/* print usage of the program */ +static void usage(int status, char *arg0) +{ + char *name = strrchr(arg0, '/'); + name = name ? name + 1 : arg0; + fprintf(status ? stderr : stdout, "usage: %s uri [api verb [data]]\n", name); + exit(status); +} + +/* entry function */ +int main(int ac, char **av, char **env) +{ + int rc; + sd_event *loop; + + /* check the argument count */ + if (ac != 2 && ac != 4 && ac != 5) + usage(1, av[0]); + + /* emit error and exit if requested */ + if (!strcmp(av[1], "-h") || !strcmp(av[1], "--help")) + usage(0, av[0]); + + /* get the default event loop */ + rc = sd_event_default(&loop); + if (rc < 0) { + fprintf(stderr, "connection to default event loop failed: %s\n", strerror(-rc)); + return 1; + } + + /* connect the websocket wsj1 to the uri given by the first argument */ + wsj1 = afb_ws_client_connect_wsj1(loop,av[1], &itf, NULL); + if (wsj1 == NULL) { + fprintf(stderr, "connection to %s failed: %m\n", av[1]); + return 1; + } + + /* test the behaviour */ + if (ac == 2) { + /* get requests from stdin */ + fcntl(0, F_SETFL, O_NONBLOCK); + sd_event_add_io(loop, &evsrc, 0, EPOLLIN, io_event_callback, NULL); + } else { + /* the request is defined by the arguments */ + exonrep = 1; + emit(av[2], av[3], av[4]); + } + + /* loop until end */ + for(;;) + sd_event_run(loop, 30000000); + return 0; +} + +/* called when wsj1 hangsup */ +static void on_hangup(void *closure, struct afb_wsj1 *wsj1) +{ + printf("ON-HANGUP\n"); + exit(0); +} + +/* called when wsj1 receives a method invocation */ +static void on_call(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg) +{ + int rc; + printf("ON-CALL %s/%s(%s)\n", api, verb, afb_wsj1_msg_object_s(msg)); + rc = afb_wsj1_reply_error_s(msg, "\"unimplemented\"", NULL); + if (rc < 0) + fprintf(stderr, "replying failed: %m\n"); +} + +/* called when wsj1 receives an event */ +static void on_event(void *closure, const char *event, struct afb_wsj1_msg *msg) +{ + printf("ON-EVENT %s(%s)\n", event, afb_wsj1_msg_object_s(msg)); +} + +/* called when wsj1 receives a reply */ +static void on_reply(void *closure, struct afb_wsj1_msg *msg) +{ + printf("ON-REPLY %s: %s\n", (char*)closure, afb_wsj1_msg_object_s(msg)); + free(closure); + callcount--; + if (exonrep && !callcount) + //afb_wsj1_hangup(afb_wsj1_msg_wsj1(msg)); + exit(0); +} + +/* makes a call */ +static void call(const char *api, const char *verb, const char *object) +{ + static int num = 0; + char *key; + int rc; + + /* allocates an id for the request */ + rc = asprintf(&key, "%d:%s/%s", ++num, api, verb); + + /* send the request */ + callcount++; + rc = afb_wsj1_call_s(wsj1, api, verb, object, on_reply, key); + if (rc < 0) { + fprintf(stderr, "calling %s/%s(%s) failed: %m\n", api, verb, object); + callcount--; + } +} + +/* sends an event */ +static void event(const char *event, const char *object) +{ + int rc; + + rc = afb_wsj1_send_event_s(wsj1, event, object); + if (rc < 0) + fprintf(stderr, "sending !%s(%s) failed: %m\n", event, object); +} + +/* emits either a call (when api!='!') or an event */ +static void emit(const char *api, const char *verb, const char *object) +{ + if (object == NULL || object[0] == 0) + object = "null"; + if (api[0] == '!' && api[1] == 0) + event(verb, object); + else + call(api, verb, object); +} + +/* called when something happens on stdin */ +static int io_event_callback(sd_event_source *src, int fd, uint32_t revents, void *closure) +{ + static size_t count = 0; + static char line[16384]; + static char sep[] = " \t"; + static char sepnl[] = " \t\n"; + + ssize_t rc; + size_t pos; + + /* read the buffer */ + do { rc = read(0, line + count, sizeof line - count); } while (rc < 0 && errno == EINTR); + if (rc < 0) { + fprintf(stderr, "read error: %m\n"); + exit(1); + } + if (rc == 0) { + if (!callcount) + exit(0); + exonrep = 1; + sd_event_source_unref(evsrc); + } + count += (size_t)rc; + + /* normalise the buffer content */ + /* TODO: handle backspace \x7f ? */ + + /* process the lines */ + pos = 0; + for(;;) { + size_t i, api[2], verb[2], rest[2]; + i = pos; + while(i < count && strchr(sep, line[i])) i++; + api[0] = i; while(i < count && !strchr(sepnl, line[i])) i++; api[1] = i; + while(i < count && strchr(sep, line[i])) i++; + verb[0] = i; while(i < count && !strchr(sepnl, line[i])) i++; verb[1] = i; + while(i < count && strchr(sep, line[i])) i++; + rest[0] = i; while(i < count && line[i] != '\n') i++; rest[1] = i; + if (i == count) break; + line[i++] = 0; + if (api[0] == api[1] || verb[0] == verb[1]) + fprintf(stderr, "bad line: %s\n", line+pos); + else { + line[api[1]] = line[verb[1]] = 0; + emit(line + api[0], line + verb[0], line + rest[0]); + } + pos = i; + } + count -= pos; + if (count == sizeof line) { + fprintf(stderr, "overflow\n"); + exit(1); + } + if (count) + memmove(line, line + pos, count); + return 1; +} + diff --git a/templates/native/app/xxxxxx-native-client.c b/templates/native/app/xxxxxx-native-client.c deleted file mode 100644 index 312fd1a..0000000 --- a/templates/native/app/xxxxxx-native-client.c +++ /dev/null @@ -1,242 +0,0 @@ -/* - * Copyright (C) 2015, 2016 "IoT.bzh" - * Author "Fulup Ar Foll" - * Author José Bollo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define _GNU_SOURCE - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include - -/* declaration of functions */ -static void on_hangup(void *closure, struct afb_wsj1 *wsj1); -static void on_call(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg); -static void on_event(void *closure, const char *event, struct afb_wsj1_msg *msg); -static int io_event_callback(sd_event_source *src, int fd, uint32_t revents, void *closure); -static void emit(const char *api, const char *verb, const char *object); - -/* the callback interface for wsj1 */ -static struct afb_wsj1_itf itf = { - .on_hangup = on_hangup, - .on_call = on_call, - .on_event = on_event -}; - -/* global variables */ -static struct afb_wsj1 *wsj1; -static int exonrep; -static int callcount; -static sd_event_source *evsrc; - -/* print usage of the program */ -static void usage(int status, char *arg0) -{ - char *name = strrchr(arg0, '/'); - name = name ? name + 1 : arg0; - fprintf(status ? stderr : stdout, "usage: %s uri [api verb [data]]\n", name); - exit(status); -} - -/* entry function */ -int main(int ac, char **av, char **env) -{ - int rc; - sd_event *loop; - - /* check the argument count */ - if (ac != 2 && ac != 4 && ac != 5) - usage(1, av[0]); - - /* emit error and exit if requested */ - if (!strcmp(av[1], "-h") || !strcmp(av[1], "--help")) - usage(0, av[0]); - - /* get the default event loop */ - rc = sd_event_default(&loop); - if (rc < 0) { - fprintf(stderr, "connection to default event loop failed: %s\n", strerror(-rc)); - return 1; - } - - /* connect the websocket wsj1 to the uri given by the first argument */ - wsj1 = afb_ws_client_connect_wsj1(loop,av[1], &itf, NULL); - if (wsj1 == NULL) { - fprintf(stderr, "connection to %s failed: %m\n", av[1]); - return 1; - } - - /* test the behaviour */ - if (ac == 2) { - /* get requests from stdin */ - fcntl(0, F_SETFL, O_NONBLOCK); - sd_event_add_io(loop, &evsrc, 0, EPOLLIN, io_event_callback, NULL); - } else { - /* the request is defined by the arguments */ - exonrep = 1; - emit(av[2], av[3], av[4]); - } - - /* loop until end */ - for(;;) - sd_event_run(loop, 30000000); - return 0; -} - -/* called when wsj1 hangsup */ -static void on_hangup(void *closure, struct afb_wsj1 *wsj1) -{ - printf("ON-HANGUP\n"); - exit(0); -} - -/* called when wsj1 receives a method invocation */ -static void on_call(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg) -{ - int rc; - printf("ON-CALL %s/%s(%s)\n", api, verb, afb_wsj1_msg_object_s(msg)); - rc = afb_wsj1_reply_error_s(msg, "\"unimplemented\"", NULL); - if (rc < 0) - fprintf(stderr, "replying failed: %m\n"); -} - -/* called when wsj1 receives an event */ -static void on_event(void *closure, const char *event, struct afb_wsj1_msg *msg) -{ - printf("ON-EVENT %s(%s)\n", event, afb_wsj1_msg_object_s(msg)); -} - -/* called when wsj1 receives a reply */ -static void on_reply(void *closure, struct afb_wsj1_msg *msg) -{ - printf("ON-REPLY %s: %s\n", (char*)closure, afb_wsj1_msg_object_s(msg)); - free(closure); - callcount--; - if (exonrep && !callcount) - //afb_wsj1_hangup(afb_wsj1_msg_wsj1(msg)); - exit(0); -} - -/* makes a call */ -static void call(const char *api, const char *verb, const char *object) -{ - static int num = 0; - char *key; - int rc; - - /* allocates an id for the request */ - rc = asprintf(&key, "%d:%s/%s", ++num, api, verb); - - /* send the request */ - callcount++; - rc = afb_wsj1_call_s(wsj1, api, verb, object, on_reply, key); - if (rc < 0) { - fprintf(stderr, "calling %s/%s(%s) failed: %m\n", api, verb, object); - callcount--; - } -} - -/* sends an event */ -static void event(const char *event, const char *object) -{ - int rc; - - rc = afb_wsj1_send_event_s(wsj1, event, object); - if (rc < 0) - fprintf(stderr, "sending !%s(%s) failed: %m\n", event, object); -} - -/* emits either a call (when api!='!') or an event */ -static void emit(const char *api, const char *verb, const char *object) -{ - if (object == NULL || object[0] == 0) - object = "null"; - if (api[0] == '!' && api[1] == 0) - event(verb, object); - else - call(api, verb, object); -} - -/* called when something happens on stdin */ -static int io_event_callback(sd_event_source *src, int fd, uint32_t revents, void *closure) -{ - static size_t count = 0; - static char line[16384]; - static char sep[] = " \t"; - static char sepnl[] = " \t\n"; - - ssize_t rc; - size_t pos; - - /* read the buffer */ - do { rc = read(0, line + count, sizeof line - count); } while (rc < 0 && errno == EINTR); - if (rc < 0) { - fprintf(stderr, "read error: %m\n"); - exit(1); - } - if (rc == 0) { - if (!callcount) - exit(0); - exonrep = 1; - sd_event_source_unref(evsrc); - } - count += (size_t)rc; - - /* normalise the buffer content */ - /* TODO: handle backspace \x7f ? */ - - /* process the lines */ - pos = 0; - for(;;) { - size_t i, api[2], verb[2], rest[2]; - i = pos; - while(i < count && strchr(sep, line[i])) i++; - api[0] = i; while(i < count && !strchr(sepnl, line[i])) i++; api[1] = i; - while(i < count && strchr(sep, line[i])) i++; - verb[0] = i; while(i < count && !strchr(sepnl, line[i])) i++; verb[1] = i; - while(i < count && strchr(sep, line[i])) i++; - rest[0] = i; while(i < count && line[i] != '\n') i++; rest[1] = i; - if (i == count) break; - line[i++] = 0; - if (api[0] == api[1] || verb[0] == verb[1]) - fprintf(stderr, "bad line: %s\n", line+pos); - else { - line[api[1]] = line[verb[1]] = 0; - emit(line + api[0], line + verb[0], line + rest[0]); - } - pos = i; - } - count -= pos; - if (count == sizeof line) { - fprintf(stderr, "overflow\n"); - exit(1); - } - if (count) - memmove(line, line + pos, count); - return 1; -} - diff --git a/templates/service/binding/xxx-service-cb.c b/templates/service/binding/xxx-service-cb.c new file mode 100644 index 0000000..9b765ed --- /dev/null +++ b/templates/service/binding/xxx-service-cb.c @@ -0,0 +1,241 @@ +/* + * Copyright (C) 2015, 2016 "IoT.bzh" + * Author "Fulup Ar Foll" + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#define _GNU_SOURCE +#include +#include +#include + +#include + #include "xxx-service-hat.h" + + const struct afb_binding_interface *interface; + + static struct event *events = 0; + +/* searchs the event of tag */ + struct event *event_get(const char *tag) +{ + struct event *e = events; + while(e && strcmp(e->tag, tag)) + e = e->next; + return e; +} + +/* deletes the event of tag */ + int event_del(const char *tag) +{ + struct event *e, **p; + + /* check exists */ + e = event_get(tag); + if (!e) return -1; + + /* unlink */ + p = &events; + while(*p != e) p = &(*p)->next; + *p = e->next; + + /* destroys */ + afb_event_drop(e->event); + free(e); + return 0; +} + +/* creates the event of tag */ + int event_add(const char *tag, const char *name) +{ + struct event *e; + + /* check valid tag */ + e = event_get(tag); + if (e) return -1; + + /* creation */ + e = malloc(strlen(tag) + sizeof *e); + if (!e) return -1; + strcpy(e->tag, tag); + + /* make the event */ + e->event = afb_daemon_make_event(interface->daemon, name); + if (!e->event.closure) { free(e); return -1; } + + /* link */ + e->next = events; + events = e; + return 0; +} + + int event_subscribe(struct afb_req request, const char *tag) +{ + struct event *e; + e = event_get(tag); + return e ? afb_req_subscribe(request, e->event) : -1; +} + + int event_unsubscribe(struct afb_req request, const char *tag) +{ + struct event *e; + e = event_get(tag); + return e ? afb_req_unsubscribe(request, e->event) : -1; +} + + int event_push(struct json_object *args, const char *tag) +{ + struct event *e; + e = event_get(tag); + return e ? afb_event_push(e->event, json_object_get(args)) : -1; +} + +// Sample Generic Ping Debug API + static void ping(struct afb_req request, json_object *jresp, const char *tag) +{ + static int pingcount = 0; + json_object *query = afb_req_json(request); + afb_req_success_f(request, jresp, "Ping Binder Daemon tag=%s count=%d query=%s", tag, ++pingcount, json_object_to_json_string(query)); +} + + void pingSample (struct afb_req request) +{ + ping(request, json_object_new_string ("Some String"), "pingSample"); +} + + void pingFail (struct afb_req request) +{ + afb_req_fail(request, "failed", "Ping Binder Daemon fails"); +} + + void pingNull (struct afb_req request) +{ + ping(request, NULL, "pingNull"); +} + + void pingBug (struct afb_req request) +{ + ping((struct afb_req){NULL,NULL}, NULL, "pingBug"); +} + + void pingEvent(struct afb_req request) +{ + json_object *query = afb_req_json(request); + afb_daemon_broadcast_event(interface->daemon, "event", json_object_get(query)); + ping(request, json_object_get(query), "event"); +} + + +// For samples https://linuxprograms.wordpress.com/2010/05/20/json-c-libjson-tutorial/ + void pingJson (struct afb_req request) { + json_object *jresp, *embed; + + jresp = json_object_new_object(); + json_object_object_add(jresp, "myString", json_object_new_string ("Some String")); + json_object_object_add(jresp, "myInt", json_object_new_int (1234)); + + embed = json_object_new_object(); + json_object_object_add(embed, "subObjString", json_object_new_string ("Some String")); + json_object_object_add(embed, "subObjInt", json_object_new_int (5678)); + + json_object_object_add(jresp,"eobj", embed); + + ping(request, jresp, "pingJson"); +} + + void subcallcb (void *prequest, int iserror, json_object *object) +{ + struct afb_req request = afb_req_unstore(prequest); + if (iserror) + afb_req_fail(request, "failed", json_object_to_json_string(object)); + else + afb_req_success(request, object, NULL); + afb_req_unref(request); +} + + void subcall (struct afb_req request) +{ + const char *api = afb_req_value(request, "api"); + const char *verb = afb_req_value(request, "verb"); + const char *args = afb_req_value(request, "args"); + json_object *object = api && verb && args ? json_tokener_parse(args) : NULL; + + if (object == NULL) + afb_req_fail(request, "failed", "bad arguments"); + else + afb_req_subcall(request, api, verb, object, subcallcb, afb_req_store(request)); +} + + void eventadd (struct afb_req request) +{ + const char *tag = afb_req_value(request, "tag"); + const char *name = afb_req_value(request, "name"); + + if (tag == NULL || name == NULL) + afb_req_fail(request, "failed", "bad arguments"); + else if (0 != event_add(tag, name)) + afb_req_fail(request, "failed", "creation error"); + else + afb_req_success(request, NULL, NULL); +} + + void eventdel (struct afb_req request) +{ + const char *tag = afb_req_value(request, "tag"); + + if (tag == NULL) + afb_req_fail(request, "failed", "bad arguments"); + else if (0 != event_del(tag)) + afb_req_fail(request, "failed", "deletion error"); + else + afb_req_success(request, NULL, NULL); +} + + void eventsub (struct afb_req request) +{ + const char *tag = afb_req_value(request, "tag"); + + if (tag == NULL) + afb_req_fail(request, "failed", "bad arguments"); + else if (0 != event_subscribe(request, tag)) + afb_req_fail(request, "failed", "subscription error"); + else + afb_req_success(request, NULL, NULL); +} + + void eventunsub (struct afb_req request) +{ + const char *tag = afb_req_value(request, "tag"); + + if (tag == NULL) + afb_req_fail(request, "failed", "bad arguments"); + else if (0 != event_unsubscribe(request, tag)) + afb_req_fail(request, "failed", "unsubscription error"); + else + afb_req_success(request, NULL, NULL); +} + + void eventpush (struct afb_req request) +{ + const char *tag = afb_req_value(request, "tag"); + const char *data = afb_req_value(request, "data"); + json_object *object = data ? json_tokener_parse(data) : NULL; + + if (tag == NULL) + afb_req_fail(request, "failed", "bad arguments"); + else if (0 > event_push(object, tag)) + afb_req_fail(request, "failed", "push error"); + else + afb_req_success(request, NULL, NULL); +} \ No newline at end of file diff --git a/templates/service/binding/xxx-service-hat.c b/templates/service/binding/xxx-service-hat.c new file mode 100644 index 0000000..2e172e8 --- /dev/null +++ b/templates/service/binding/xxx-service-hat.c @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2015, 2016 "IoT.bzh" + * Author "Fulup Ar Foll" + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#define _GNU_SOURCE +#include +#include +#include + +#include +#include "xxx-service-hat.h" + +const struct afb_binding_interface *interface; + +// NOTE: this sample does not use session to keep test a basic as possible +// in real application most APIs should be protected with AFB_SESSION_CHECK +static const struct afb_verb_desc_v1 verbs[]= { + {"ping" , AFB_SESSION_NONE, pingSample , "Ping the binder"}, + {"pingfail" , AFB_SESSION_NONE, pingFail , "Ping that fails"}, + {"pingnull" , AFB_SESSION_NONE, pingNull , "Ping which returns NULL"}, + {"pingbug" , AFB_SESSION_NONE, pingBug , "Do a Memory Violation"}, + {"pingJson" , AFB_SESSION_NONE, pingJson , "Return a JSON object"}, + {"pingevent", AFB_SESSION_NONE, pingEvent , "Send an event"}, + {"subcall", AFB_SESSION_NONE, subcall , "Call api/verb(args)"}, + {"eventadd", AFB_SESSION_NONE, eventadd , "adds the event of 'name' for the 'tag'"}, + {"eventdel", AFB_SESSION_NONE, eventdel , "deletes the event of 'tag'"}, + {"eventsub", AFB_SESSION_NONE, eventsub , "subscribes to the event of 'tag'"}, + {"eventunsub",AFB_SESSION_NONE, eventunsub , "unsubscribes to the event of 'tag'"}, + {"eventpush", AFB_SESSION_NONE, eventpush , "pushes the event of 'tag' with the 'data'"}, + {NULL} +}; + +static const struct afb_binding plugin_desc = { + .type = AFB_BINDING_VERSION_1, + .v1 = { + .info = "xxxxxx service", + .prefix = "xxxxxx", + .verbs = verbs + } +}; + +const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf) +{ + interface = itf; + return &plugin_desc; +} diff --git a/templates/service/binding/xxx-service-hat.h b/templates/service/binding/xxx-service-hat.h new file mode 100644 index 0000000..a80c0c2 --- /dev/null +++ b/templates/service/binding/xxx-service-hat.h @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2015, 2016 "IoT.bzh" + * Author "Fulup Ar Foll" + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef SERVICEHAT_H +#define SERVICEHAT_H + +#define _GNU_SOURCE +#include +#include +#include + +#include + +extern const struct afb_binding_interface *interface; + +struct event +{ + struct event *next; + struct afb_event event; + char tag[1]; +}; + +/* searchs the event of tag */ +struct event *event_get(const char *tag); + +/* deletes the event of tag */ +int event_del(const char *tag); + +/* creates the event of tag */ +int event_add(const char *tag, const char *name); + +int event_subscribe(struct afb_req request, const char *tag); + +int event_unsubscribe(struct afb_req request, const char *tag); + +int event_push(struct json_object *args, const char *tag); + +void pingSample (struct afb_req request); + +void pingFail (struct afb_req request); + +void pingNull (struct afb_req request); + +void pingBug (struct afb_req request); + +void pingEvent(struct afb_req request); + +// For samples https://linuxprograms.wordpress.com/2010/05/20/json-c-libjson-tutorial/ +void pingJson (struct afb_req request); + +void subcallcb (void *prequest, int iserror, json_object *object); + +void subcall (struct afb_req request); + +void eventadd (struct afb_req request); + +void eventdel (struct afb_req request); + +void eventsub (struct afb_req request); + +void eventunsub (struct afb_req request); + +void eventpush (struct afb_req request); + +#endif \ No newline at end of file diff --git a/templates/service/binding/xxxxxx-service-binding.c b/templates/service/binding/xxxxxx-service-binding.c deleted file mode 100644 index 5e823d2..0000000 --- a/templates/service/binding/xxxxxx-service-binding.c +++ /dev/null @@ -1,279 +0,0 @@ -/* - * Copyright (C) 2015, 2016 "IoT.bzh" - * Author "Fulup Ar Foll" - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#define _GNU_SOURCE -#include -#include -#include - -#include - -const struct afb_binding_interface *interface; - -struct event -{ - struct event *next; - struct afb_event event; - char tag[1]; -}; - -static struct event *events = 0; - -/* searchs the event of tag */ -static struct event *event_get(const char *tag) -{ - struct event *e = events; - while(e && strcmp(e->tag, tag)) - e = e->next; - return e; -} - -/* deletes the event of tag */ -static int event_del(const char *tag) -{ - struct event *e, **p; - - /* check exists */ - e = event_get(tag); - if (!e) return -1; - - /* unlink */ - p = &events; - while(*p != e) p = &(*p)->next; - *p = e->next; - - /* destroys */ - afb_event_drop(e->event); - free(e); - return 0; -} - -/* creates the event of tag */ -static int event_add(const char *tag, const char *name) -{ - struct event *e; - - /* check valid tag */ - e = event_get(tag); - if (e) return -1; - - /* creation */ - e = malloc(strlen(tag) + sizeof *e); - if (!e) return -1; - strcpy(e->tag, tag); - - /* make the event */ - e->event = afb_daemon_make_event(interface->daemon, name); - if (!e->event.closure) { free(e); return -1; } - - /* link */ - e->next = events; - events = e; - return 0; -} - -static int event_subscribe(struct afb_req request, const char *tag) -{ - struct event *e; - e = event_get(tag); - return e ? afb_req_subscribe(request, e->event) : -1; -} - -static int event_unsubscribe(struct afb_req request, const char *tag) -{ - struct event *e; - e = event_get(tag); - return e ? afb_req_unsubscribe(request, e->event) : -1; -} - -static int event_push(struct json_object *args, const char *tag) -{ - struct event *e; - e = event_get(tag); - return e ? afb_event_push(e->event, json_object_get(args)) : -1; -} - -// Sample Generic Ping Debug API -static void ping(struct afb_req request, json_object *jresp, const char *tag) -{ - static int pingcount = 0; - json_object *query = afb_req_json(request); - afb_req_success_f(request, jresp, "Ping Binder Daemon tag=%s count=%d query=%s", tag, ++pingcount, json_object_to_json_string(query)); -} - -static void pingSample (struct afb_req request) -{ - ping(request, json_object_new_string ("Some String"), "pingSample"); -} - -static void pingFail (struct afb_req request) -{ - afb_req_fail(request, "failed", "Ping Binder Daemon fails"); -} - -static void pingNull (struct afb_req request) -{ - ping(request, NULL, "pingNull"); -} - -static void pingBug (struct afb_req request) -{ - ping((struct afb_req){NULL,NULL,NULL}, NULL, "pingBug"); -} - -static void pingEvent(struct afb_req request) -{ - json_object *query = afb_req_json(request); - afb_daemon_broadcast_event(interface->daemon, "event", json_object_get(query)); - ping(request, json_object_get(query), "event"); -} - - -// For samples https://linuxprograms.wordpress.com/2010/05/20/json-c-libjson-tutorial/ -static void pingJson (struct afb_req request) { - json_object *jresp, *embed; - - jresp = json_object_new_object(); - json_object_object_add(jresp, "myString", json_object_new_string ("Some String")); - json_object_object_add(jresp, "myInt", json_object_new_int (1234)); - - embed = json_object_new_object(); - json_object_object_add(embed, "subObjString", json_object_new_string ("Some String")); - json_object_object_add(embed, "subObjInt", json_object_new_int (5678)); - - json_object_object_add(jresp,"eobj", embed); - - ping(request, jresp, "pingJson"); -} - -static void subcallcb (void *prequest, int iserror, json_object *object) -{ - struct afb_req request = afb_req_unstore(prequest); - if (iserror) - afb_req_fail(request, "failed", json_object_to_json_string(object)); - else - afb_req_success(request, object, NULL); - afb_req_unref(request); -} - -static void subcall (struct afb_req request) -{ - const char *api = afb_req_value(request, "api"); - const char *verb = afb_req_value(request, "verb"); - const char *args = afb_req_value(request, "args"); - json_object *object = api && verb && args ? json_tokener_parse(args) : NULL; - - if (object == NULL) - afb_req_fail(request, "failed", "bad arguments"); - else - afb_req_subcall(request, api, verb, object, subcallcb, afb_req_store(request)); -} - -static void eventadd (struct afb_req request) -{ - const char *tag = afb_req_value(request, "tag"); - const char *name = afb_req_value(request, "name"); - - if (tag == NULL || name == NULL) - afb_req_fail(request, "failed", "bad arguments"); - else if (0 != event_add(tag, name)) - afb_req_fail(request, "failed", "creation error"); - else - afb_req_success(request, NULL, NULL); -} - -static void eventdel (struct afb_req request) -{ - const char *tag = afb_req_value(request, "tag"); - - if (tag == NULL) - afb_req_fail(request, "failed", "bad arguments"); - else if (0 != event_del(tag)) - afb_req_fail(request, "failed", "deletion error"); - else - afb_req_success(request, NULL, NULL); -} - -static void eventsub (struct afb_req request) -{ - const char *tag = afb_req_value(request, "tag"); - - if (tag == NULL) - afb_req_fail(request, "failed", "bad arguments"); - else if (0 != event_subscribe(request, tag)) - afb_req_fail(request, "failed", "subscription error"); - else - afb_req_success(request, NULL, NULL); -} - -static void eventunsub (struct afb_req request) -{ - const char *tag = afb_req_value(request, "tag"); - - if (tag == NULL) - afb_req_fail(request, "failed", "bad arguments"); - else if (0 != event_unsubscribe(request, tag)) - afb_req_fail(request, "failed", "unsubscription error"); - else - afb_req_success(request, NULL, NULL); -} - -static void eventpush (struct afb_req request) -{ - const char *tag = afb_req_value(request, "tag"); - const char *data = afb_req_value(request, "data"); - json_object *object = data ? json_tokener_parse(data) : NULL; - - if (tag == NULL) - afb_req_fail(request, "failed", "bad arguments"); - else if (0 > event_push(object, tag)) - afb_req_fail(request, "failed", "push error"); - else - afb_req_success(request, NULL, NULL); -} - -// NOTE: this sample does not use session to keep test a basic as possible -// in real application most APIs should be protected with AFB_SESSION_CHECK -static const struct afb_verb_desc_v1 verbs[]= { - {"ping" , AFB_SESSION_NONE, pingSample , "Ping the binder"}, - {"pingfail" , AFB_SESSION_NONE, pingFail , "Ping that fails"}, - {"pingnull" , AFB_SESSION_NONE, pingNull , "Ping which returns NULL"}, - {"pingbug" , AFB_SESSION_NONE, pingBug , "Do a Memory Violation"}, - {"pingJson" , AFB_SESSION_NONE, pingJson , "Return a JSON object"}, - {"pingevent", AFB_SESSION_NONE, pingEvent , "Send an event"}, - {"subcall", AFB_SESSION_NONE, subcall , "Call api/verb(args)"}, - {"eventadd", AFB_SESSION_NONE, eventadd , "adds the event of 'name' for the 'tag'"}, - {"eventdel", AFB_SESSION_NONE, eventdel , "deletes the event of 'tag'"}, - {"eventsub", AFB_SESSION_NONE, eventsub , "subscribes to the event of 'tag'"}, - {"eventunsub",AFB_SESSION_NONE, eventunsub , "unsubscribes to the event of 'tag'"}, - {"eventpush", AFB_SESSION_NONE, eventpush , "pushes the event of 'tag' with the 'data'"}, - {NULL} -}; - -static const struct afb_binding plugin_desc = { - .type = AFB_BINDING_VERSION_1, - .v1 = { - .info = "xxxxxx service", - .prefix = "xxxxxx", - .verbs = verbs - } -}; - -const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf) -{ - interface = itf; - return &plugin_desc; -} -- cgit 1.2.3-korg