moving to cmake

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

diff --git a/src/utils-jbus.c b/src/utils-jbus.c
index 8c48113..ef87227 100644 (file)
--- a/src/utils-jbus.c
+++ b/src/utils-jbus.c
@@ -1,6 +1,8 @@
 /*
  Copyright 2015 IoT.bzh
 
+ author: José Bollo <jose.bollo@iot.bzh>
+
  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
@@ -60,19 +62,6 @@ static const char reply_out_of_memory[] = "{\"status\":\"out of memory\"}";
 static const char reply_invalid[] = "{\"status\":\"invalid request\"}";
 static const char interface_jbus[] = "org.jbus";
 
-static int send_reply(struct jreq *jreq, const char *reply)
-{
-       int rc = -1;
-       if (dbus_message_append_args(jreq->reply, DBUS_TYPE_STRING, &reply, DBUS_TYPE_INVALID)) {
-               if (dbus_connection_send(jreq->connection, jreq->reply, NULL))
-                       rc = 0;
-       }
-       dbus_message_unref(jreq->reply);
-       dbus_connection_unref(jreq->connection);
-       free(jreq);
-       return rc;
-}
-
 static DBusHandlerResult incoming_resp(DBusConnection *connection, DBusMessage *message, struct jbus *jbus)
 {
        int status;
@@ -82,7 +71,7 @@ static DBusHandlerResult incoming_resp(DBusConnection *connection, DBusMessage *
        dbus_uint32_t serial;
 
        /* search for the waiter */
-       serial = dbus_message_get_serial(message);
+       serial = dbus_message_get_reply_serial(message);
        prv = &jbus->waiters;
        while ((jrw = *prv) != NULL && jrw->serial != serial)
                prv = &jrw->next;
@@ -144,12 +133,12 @@ static DBusHandlerResult incoming_call(DBusConnection *connection, DBusMessage *
        
        /* retrieve the json value */
        if (!dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID)) {
-               send_reply(jreq, reply_invalid);
+               jbus_replyj(jreq, reply_invalid);
                return DBUS_HANDLER_RESULT_HANDLED;
        }
        query = json_tokener_parse(str);
        if (query == NULL) {
-               send_reply(jreq, reply_invalid);
+               jbus_replyj(jreq, reply_invalid);
                return DBUS_HANDLER_RESULT_HANDLED;
        }
 
@@ -245,10 +234,23 @@ void jbus_unref(struct jbus *jbus)
        }
 }
 
+int jbus_replyj(struct jreq *jreq, const char *reply)
+{
+       int rc = -1;
+       if (dbus_message_append_args(jreq->reply, DBUS_TYPE_STRING, &reply, DBUS_TYPE_INVALID)) {
+               if (dbus_connection_send(jreq->connection, jreq->reply, NULL))
+                       rc = 0;
+       }
+       dbus_message_unref(jreq->reply);
+       dbus_connection_unref(jreq->connection);
+       free(jreq);
+       return rc;
+}
+
 int jbus_reply(struct jreq *jreq, struct json_object *reply)
 {
        const char *str = json_object_to_json_string(reply);
-       return send_reply(jreq, str ? str : reply_out_of_memory);
+       return jbus_replyj(jreq, str ? str : reply_out_of_memory);
 }
 
 int jbus_add_service(struct jbus *jbus, const char *method, void (*oncall)(struct jreq *jreq, struct json_object *request))
@@ -274,8 +276,6 @@ int jbus_add_service(struct jbus *jbus, const char *method, void (*oncall)(struc
 
        return 0;
 
-error3:
-       free(srv->method);
 error2:
        free(srv);
 error:
@@ -291,14 +291,22 @@ int jbus_start_serving(struct jbus *jbus)
                return 0;
        case DBUS_REQUEST_NAME_REPLY_EXISTS:
        case DBUS_REQUEST_NAME_REPLY_IN_QUEUE:
+       default:
                errno = EADDRINUSE;
                return -1;
        }
 }
 
+int jbus_read_write_dispatch(struct jbus *jbus, int toms)
+{
+       if (dbus_connection_read_write_dispatch(jbus->connection, toms));
+               return 0;
+       errno = EPIPE;
+       return -1;
+}
+
 int jbus_callj(struct jbus *jbus, const char *method, const char *query, void (*onresp)(int status, struct json_object *response, void *data), void *data)
 {
-       int rc;
        DBusMessage *msg;
        struct jrespw *resp;
 
@@ -374,7 +382,7 @@ int main()
        int s2 = jbus_add_service(jbus, "incr", incr);
        int s3 = jbus_start_serving(jbus);
        printf("started %d %d %d\n", s1, s2, s3);
-       while (dbus_connection_read_write_dispatch (jbus->connection, -1))
+       while (!jbus_read_write_dispatch (jbus, -1))
                ;
 }
 #endif
@@ -393,9 +401,9 @@ int main()
        while(i--) {
                jbus_callj(jbus, "ping", "{\"toto\":[1,2,3,4,true,\"toto\"]}", onresp, "ping");
                jbus_callj(jbus, "incr", "{\"doit\":\"for-me\"}", onresp, "incr");
-               dbus_connection_read_write_dispatch (jbus->connection, 1);
+               jbus_read_write_dispatch (jbus, 1);
        }
-       while (dbus_connection_read_write_dispatch (jbus->connection, -1))
+       while (!jbus_read_write_dispatch (jbus, -1))
                ;
 }
 #endif