utils-jbus: adds closure

[src/app-framework-main.git] / src / utils-jbus.c

diff --git a/src/utils-jbus.c b/src/utils-jbus.c
index e379921..6d01b1e 100644 (file)
--- a/src/utils-jbus.c
+++ b/src/utils-jbus.c
@@ -29,6 +29,8 @@
 
 #include "utils-jbus.h"
 
+#define MAX_JSON_DEPTH 5
+
 struct jreq;
 struct jservice;
 struct jbus;
@@ -43,16 +45,18 @@ struct jreq {
 struct jservice {
        struct jservice *next;
        char *method;
-       void (*oncall_s)(struct jreq *, const char *);
-       void (*oncall_j)(struct jreq *, struct json_object *);
+       void (*oncall_s)(struct jreq *, const char *, void *);
+       void (*oncall_j)(struct jreq *, struct json_object *, void *);
+       void *data;
 };
 
 /* structure for signal handlers */
 struct jsignal {
        struct jsignal *next;
        char *name;
-       void (*onsignal_s)(const char *);
-       void (*onsignal_j)(struct json_object *);
+       void (*onsignal_s)(const char *, void *);
+       void (*onsignal_j)(struct json_object *, void *);
+       void *data;
 };
 
 /* structure for recording asynchronous requests */
@@ -73,6 +77,7 @@ struct respsync {
 /* structure for handling either client or server jbus on dbus */
 struct jbus {
        int refcount;
+       struct json_tokener *tokener;
        struct jservice *services;
        DBusConnection *connection;
        struct jsignal *signals;
@@ -117,8 +122,9 @@ static int matchitf(struct jbus *jbus, DBusMessage *message)
 static int add_service(
                struct jbus *jbus,
                const char *method,
-               void (*oncall_s)(struct jreq*, const char*),
-               void (*oncall_j)(struct jreq*, struct json_object*)
+               void (*oncall_s)(struct jreq*, const char*, void*),
+               void (*oncall_j)(struct jreq*, struct json_object*, void*),
+               void *data
 )
 {
        struct jservice *srv;
@@ -138,6 +144,7 @@ static int add_service(
        /* record the service */
        srv->oncall_s = oncall_s;
        srv->oncall_j = oncall_j;
+       srv->data = data;
        srv->next = jbus->services;
        jbus->services = srv;
 
@@ -152,8 +159,9 @@ error:
 static int add_signal(
        struct jbus *jbus,
        const char *name,
-       void (*onsignal_s)(const char*),
-       void (*onsignal_j)(struct json_object*)
+       void (*onsignal_s)(const char*, void*),
+       void (*onsignal_j)(struct json_object*, void*),
+       void *data
 )
 {
        char *rule;
@@ -182,6 +190,7 @@ static int add_signal(
        /* record the signal */
        sig->onsignal_s = onsignal_s;
        sig->onsignal_j = onsignal_j;
+       sig->data = data;
        sig->next = jbus->signals;
        jbus->signals = sig;
 
@@ -250,6 +259,17 @@ static void sync_of_replies(int status, const char *value, void *data)
        s->replied = 1;
 }
 
+static int parse(struct jbus *jbus, const char *msg, struct json_object **obj)
+{
+       json_tokener_reset(jbus->tokener);
+       *obj = json_tokener_parse_ex(jbus->tokener, msg, -1);
+       if (json_tokener_get_error(jbus->tokener) == json_tokener_success)
+               return 1;
+       json_object_put(*obj);
+       *obj = NULL;
+       return 0;
+}
+
 static DBusHandlerResult incoming_resp(DBusConnection *connection, DBusMessage *message, struct jbus *jbus, int iserror)
 {
        int status;
@@ -268,7 +288,9 @@ static DBusHandlerResult incoming_resp(DBusConnection *connection, DBusMessage *
        *prv = jrw->next;
 
        /* retrieve the string value */
-       if (!dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID)) {
+       if (dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID))
+               status = 0;
+       else {
                status = -1;
                str = NULL;
                reply = NULL;
@@ -278,8 +300,7 @@ static DBusHandlerResult incoming_resp(DBusConnection *connection, DBusMessage *
        if (jrw->onresp_s)
                jrw->onresp_s(iserror ? -1 : status, str, jrw->data);
        else {
-               reply = json_tokener_parse(str);
-               status = reply ? 0 : -1;
+               status = parse(jbus, str, &reply) - 1;
                jrw->onresp_j(iserror ? -1 : status, reply, jrw->data);
                json_object_put(reply);
        }
@@ -320,14 +341,13 @@ static DBusHandlerResult incoming_call(DBusConnection *connection, DBusMessage *
                return reply_invalid_request(jreq);
        if (srv->oncall_s) {
                /* handling strings only */
-               srv->oncall_s(jreq, str);
+               srv->oncall_s(jreq, str, srv->data);
        }
        else {
                /* handling json only */
-               query = json_tokener_parse(str);
-               if (query == NULL)
+               if (!parse(jbus, str, &query))
                        return reply_invalid_request(jreq);
-               srv->oncall_j(jreq, query);
+               srv->oncall_j(jreq, query, srv->data);
                json_object_put(query);
        }
        return DBUS_HANDLER_RESULT_HANDLED;
@@ -356,13 +376,12 @@ static DBusHandlerResult incoming_signal(DBusConnection *connection, DBusMessage
        if (dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID)) {
                if (sig->onsignal_s) {
                        /* handling strings only */
-                       sig->onsignal_s(str);
+                       sig->onsignal_s(str, sig->data);
                }
                else {
                        /* handling json only */
-                       obj = json_tokener_parse(str);
-                       if (obj != NULL) {
-                               sig->onsignal_j(obj);
+                       if (parse(jbus, str, &obj)) {
+                               sig->onsignal_j(obj, sig->data);
                                json_object_put(obj);
                        }
                }
@@ -442,7 +461,17 @@ static dbus_bool_t watchadd(DBusWatch *watch, void *data)
 
 /************************** MAIN FUNCTIONS *****************************************/
 
-struct jbus *create_jbus(int session, const char *path)
+struct jbus *create_jbus_system(const char *path)
+{
+       return create_jbus(path, 0);
+}
+
+struct jbus *create_jbus_session(const char *path)
+{
+       return create_jbus(path, 1);
+}
+
+struct jbus *create_jbus(const char *path, int session)
 {
        struct jbus *jbus;
        char *name;
@@ -454,6 +483,11 @@ struct jbus *create_jbus(int session, const char *path)
                goto error;
        }
        jbus->refcount = 1;
+       jbus->tokener = json_tokener_new_ex(MAX_JSON_DEPTH);
+       if (jbus->tokener == NULL) {
+               errno = ENOMEM;
+               goto error2;
+       }
        jbus->path = strdup(path);
        if (jbus->path == NULL) {
                errno = ENOMEM;
@@ -509,6 +543,8 @@ void jbus_unref(struct jbus *jbus)
                        free(srv->method);
                        free(srv);
                }
+               if (jbus->tokener != NULL)
+                       json_tokener_free(jbus->tokener);
                free(jbus->name);
                free(jbus->path);
                free(jbus);
@@ -600,14 +636,14 @@ int jbus_send_signal_j(struct jbus *jbus, const char *name, struct json_object *
        return jbus_send_signal_s(jbus, name, str);
 }
 
-int jbus_add_service_s(struct jbus *jbus, const char *method, void (*oncall)(struct jreq *, const char *))
+int jbus_add_service_s(struct jbus *jbus, const char *method, void (*oncall)(struct jreq *, const char *, void *), void *data)
 {
-       return add_service(jbus, method, oncall, NULL);
+       return add_service(jbus, method, oncall, NULL, data);
 }
 
-int jbus_add_service_j(struct jbus *jbus, const char *method, void (*oncall)(struct jreq *, struct json_object *))
+int jbus_add_service_j(struct jbus *jbus, const char *method, void (*oncall)(struct jreq *, struct json_object *, void *), void *data)
 {
-       return add_service(jbus, method, NULL, oncall);
+       return add_service(jbus, method, NULL, oncall, data);
 }
 
 int jbus_start_serving(struct jbus *jbus)
@@ -667,6 +703,7 @@ int jbus_dispatch_multiple(struct jbus **jbuses, int njbuses, int maxcount)
 
        for (i = r = 0 ; i < njbuses && r < maxcount ; i++) {
                dbus_connection_read_write(jbuses[i]->connection, 0);
+               sts = dbus_connection_get_dispatch_status(jbuses[i]->connection);
                while(sts == DBUS_DISPATCH_DATA_REMAINS &&  r < maxcount) {
                        sts = dbus_connection_dispatch(jbuses[i]->connection);
                        r++;
@@ -688,10 +725,17 @@ int jbus_read_write_dispatch_multiple(struct jbus **jbuses, int njbuses, int tom
        assert(fds != NULL);
 
        r = jbus_dispatch_multiple(jbuses, njbuses, maxcount);
+       if (r)
+               return r;
        n = jbus_fill_pollfds(jbuses, njbuses, fds);
-       s = poll(fds, n, toms);
-       if (s < 0)
-               return r ? r : s;
+       for(;;) {
+               s = poll(fds, n, toms);
+               if (s >= 0)
+                       break;
+               if (errno != EINTR)
+                       return r ? r : s;
+               toms = 0;
+       }
        n = jbus_dispatch_pollfds(jbuses, njbuses, fds, maxcount - r);
        return n >= 0 ? r + n : r ? r : n;
 }
@@ -748,7 +792,7 @@ struct json_object *jbus_call_sj_sync(struct jbus *jbus, const char *method, con
        if (str == NULL)
                obj = NULL;
        else {
-               obj = json_tokener_parse(str);
+               parse(jbus, str, &obj);
                free(str);
        }
        return obj;
@@ -774,14 +818,14 @@ struct json_object *jbus_call_jj_sync(struct jbus *jbus, const char *method, str
        return jbus_call_sj_sync(jbus, method, str);
 }
 
-int jbus_on_signal_s(struct jbus *jbus, const char *name, void (*onsig)(const char *))
+int jbus_on_signal_s(struct jbus *jbus, const char *name, void (*onsig)(const char *, void *), void *data)
 {
-       return add_signal(jbus, name, onsig, NULL);
+       return add_signal(jbus, name, onsig, NULL, data);
 }
 
-int jbus_on_signal_j(struct jbus *jbus, const char *name, void (*onsig)(struct json_object *))
+int jbus_on_signal_j(struct jbus *jbus, const char *name, void (*onsig)(struct json_object *, void *), void *data)
 {
-       return add_signal(jbus, name, NULL, onsig);
+       return add_signal(jbus, name, NULL, onsig, data);
 }
 
 /************************** FEW LITTLE TESTS *****************************************/
@@ -790,13 +834,13 @@ int jbus_on_signal_j(struct jbus *jbus, const char *name, void (*onsig)(struct j
 #include <stdio.h>
 #include <unistd.h>
 struct jbus *jbus;
-void ping(struct jreq *jreq, struct json_object *request)
+void ping(struct jreq *jreq, struct json_object *request, void *unused)
 {
 printf("ping(%s) -> %s\n",json_object_to_json_string(request),json_object_to_json_string(request));
        jbus_reply_j(jreq, request);
        json_object_put(request);       
 }
-void incr(struct jreq *jreq, struct json_object *request)
+void incr(struct jreq *jreq, struct json_object *request, void *unused)
 {
        static int counter = 0;
        struct json_object *res = json_object_new_int(++counter);
@@ -810,8 +854,8 @@ int main()
 {
        int s1, s2, s3;
        jbus = create_jbus(1, "/bzh/iot/jdbus");
-       s1 = jbus_add_service_j(jbus, "ping", ping);
-       s2 = jbus_add_service_j(jbus, "incr", incr);
+       s1 = jbus_add_service_j(jbus, "ping", ping, NULL);
+       s2 = jbus_add_service_j(jbus, "incr", incr, NULL);
        s3 = jbus_start_serving(jbus);
        printf("started %d %d %d\n", s1, s2, s3);
        while (!jbus_read_write_dispatch (jbus, -1));