evt: handles broadcasting and tracking

[src/app-framework-binder.git] / src / afb-api-dbus.c

diff --git a/src/afb-api-dbus.c b/src/afb-api-dbus.c
index 905c723..054755a 100644 (file)
--- a/src/afb-api-dbus.c
+++ b/src/afb-api-dbus.c
@@ -32,6 +32,7 @@
 #include "afb-common.h"
 
 #include "session.h"
+#include "afb-msg-json.h"
 #include "afb-apis.h"
 #include "afb-api-so.h"
 #include "afb-context.h"
@@ -295,6 +296,17 @@ static void api_dbus_client_call(struct api_dbus *api, struct afb_req req, struc
        }
 }
 
+static int api_dbus_service_start(struct api_dbus *api, int share_session, int onneed)
+{
+       /* not an error when onneed */
+       if (onneed != 0)
+               return 0;
+
+       /* already started: it is an error */
+       ERROR("The Dbus binding %s is not a startable service", api->name);
+       return -1;
+}
+
 /* receives events */
 static int api_dbus_client_on_event(sd_bus_message *m, void *userdata, sd_bus_error *ret_error)
 {
@@ -342,6 +354,7 @@ int afb_api_dbus_add_client(const char *path)
        /* record it as an API */
        afb_api.closure = api;
        afb_api.call = (void*)api_dbus_client_call;
+       afb_api.service_start = (void*)api_dbus_service_start;
        if (afb_apis_add(api->api, afb_api) < 0)
                goto error2;
 
@@ -400,19 +413,7 @@ static struct json_object *dbus_req_json(struct dbus_req *dreq)
 /* get the argument of the request of 'name' */
 static struct afb_arg dbus_req_get(struct dbus_req *dreq, const char *name)
 {
-       struct afb_arg arg;
-       struct json_object *value, *root;
-
-       root = dbus_req_json(dreq);
-       if (root != NULL && json_object_object_get_ex(root, name, &value)) {
-               arg.name = name;
-               arg.value = json_object_get_string(value);
-       } else {
-               arg.name = NULL;
-               arg.value = NULL;
-       }
-       arg.path = NULL;
-       return arg;
+       return afb_msg_json_get_arg(dbus_req_json(dreq), name);
 }
 
 static void dbus_req_reply(struct dbus_req *dreq, uint8_t type, const char *first, const char *second)
@@ -536,7 +537,7 @@ static int api_dbus_server_on_object_called(sd_bus_message *message, void *userd
        return 1;
 }
 
-static void afb_api_dbus_server_send_event(struct api_dbus *api, const char *event, struct json_object *object)
+static void afb_api_dbus_server_send_event(struct api_dbus *api, const char *event, int eventid, struct json_object *object)
 {
        int rc;
 
@@ -547,6 +548,12 @@ static void afb_api_dbus_server_send_event(struct api_dbus *api, const char *eve
        json_object_put(object);
 }
 
+/* the interface for events */
+static const struct afb_evt_itf evt_itf = {
+       .broadcast = (void*)afb_api_dbus_server_send_event,
+       .push = (void*)afb_api_dbus_server_send_event
+};
+
 /* create the service */
 int afb_api_dbus_add_server(const char *path)
 {
@@ -575,7 +582,7 @@ int afb_api_dbus_add_server(const char *path)
        }
        INFO("afb service over dbus installed, name %s, path %s", api->name, api->path);
 
-       api->listener = afb_evt_listener_create((void*)afb_api_dbus_server_send_event, api);
+       api->listener = afb_evt_listener_create(&evt_itf, api);
 
        return 0;
 error3: