X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-dbus.c;h=7452339bfbfc718f3a42808bc75f4ea02e4a8bb5;hb=b69290c369ba67ee804bc5a0a440210c0e5d37a3;hp=edbb1edd53619c934f97728d8aed9921e2d2d31d;hpb=5c1e761a2f84439b6e53ff1682ee665a7db2bca1;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-dbus.c b/src/afb-api-dbus.c
index edbb1edd..7452339b 100644
--- a/src/afb-api-dbus.c
+++ b/src/afb-api-dbus.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define NO_PLUGIN_VERBOSE_MACRO
 
 #include <stdlib.h>
 #include <string.h>
@@ -31,9 +32,12 @@
 #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"
+#include "afb-evt.h"
+#include "afb-subcall.h"
 #include "verbose.h"
 
 static const char DEFAULT_PATH_PREFIX[] = "/org/agl/afb/api/";
@@ -51,6 +55,7 @@ struct api_dbus
 	char *path;		/* path of the object for the API */
 	char *name;		/* name/interface of the object */
 	char *api;		/* api name of the interface */
+	struct afb_evt_listener *listener;
 };
 
 #define RETOK   1
@@ -301,7 +306,7 @@ static int api_dbus_client_on_event(sd_bus_message *m, void *userdata, sd_bus_er
 		ERROR("unreadable event");
 	else {
 		object = json_tokener_parse(data);
-		ctxClientEventSend(NULL, event, object);
+		afb_evt_broadcast(event, object);
 		json_object_put(object);
 	}
 	return 1;
@@ -396,19 +401,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)
@@ -422,7 +415,7 @@ static void dbus_req_reply(struct dbus_req *dreq, uint8_t type, const char *firs
 
 static void dbus_req_success(struct dbus_req *dreq, struct json_object *obj, const char *info)
 {
-	dbus_req_reply(dreq, RETOK, json_object_to_json_string(obj), info);
+	dbus_req_reply(dreq, RETOK, json_object_to_json_string_ext(obj, JSON_C_TO_STRING_PLAIN), info);
 }
 
 static void dbus_req_fail(struct dbus_req *dreq, const char *status, const char *info)
@@ -443,7 +436,19 @@ static void dbus_req_send(struct dbus_req *dreq, const char *buffer, size_t size
 	dbus_req_reply(dreq, RETRAW, buffer, "");
 }
 
-struct afb_req_itf dbus_req_itf = {
+static int dbus_req_subscribe(struct dbus_req *dreq, struct afb_event event)
+{
+	return -1;
+}
+
+static int dbus_req_unsubscribe(struct dbus_req *dreq, struct afb_event event)
+{
+	return -1;
+}
+
+static void dbus_req_subcall(struct dbus_req *dreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *closure);
+
+const struct afb_req_itf afb_api_dbus_req_itf = {
 	.json = (void*)dbus_req_json,
 	.get = (void*)dbus_req_get,
 	.success = (void*)dbus_req_success,
@@ -453,9 +458,19 @@ struct afb_req_itf dbus_req_itf = {
 	.context_get = (void*)afb_context_get,
 	.context_set = (void*)afb_context_set,
 	.addref = (void*)dbus_req_addref,
-	.unref = (void*)dbus_req_unref
+	.unref = (void*)dbus_req_unref,
+	.session_close = (void*)afb_context_close,
+	.session_set_LOA = (void*)afb_context_change_loa,
+	.subscribe = (void*)dbus_req_subscribe,
+	.unsubscribe = (void*)dbus_req_unsubscribe,
+	.subcall = (void*)dbus_req_subcall
 };
 
+static void dbus_req_subcall(struct dbus_req *dreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *closure)
+{
+	afb_subcall(&dreq->context, api, verb, args, callback, closure, (struct afb_req){ .itf = &afb_api_dbus_req_itf, .closure = dreq });
+}
+
 /******************* server part **********************************/
 
 /* called when the object for the service is called */
@@ -503,7 +518,7 @@ static int api_dbus_server_on_object_called(sd_bus_message *message, void *userd
 	dreq->message = sd_bus_message_ref(message);
 	dreq->json = NULL;
 	dreq->refcount = 1;
-	areq.itf = &dbus_req_itf;
+	areq.itf = &afb_api_dbus_req_itf;
 	areq.closure = dreq;
 	afb_apis_call_(areq, &dreq->context, api->api, method);
 	dbus_req_unref(dreq);
@@ -515,25 +530,12 @@ static void afb_api_dbus_server_send_event(struct api_dbus *api, const char *eve
 	int rc;
 
 	rc = sd_bus_emit_signal(api->sdbus, api->path, api->name,
-			"event", "ss", event, json_object_to_json_string(object));
+			"event", "ss", event, json_object_to_json_string_ext(object, JSON_C_TO_STRING_PLAIN));
 	if (rc < 0)
 		ERROR("error while emiting event %s", event);
 	json_object_put(object);
 }
 
-static int afb_api_dbus_server_expects_event(struct api_dbus *api, const char *event)
-{
-	size_t len = strlen(api->api);
-	if (strncasecmp(event, api->api, len) != 0)
-		return 0;
-	return event[len] == '.';
-}
-
-static struct afb_event_listener_itf evitf = {
-	.send = (void*)afb_api_dbus_server_send_event,
-	.expects = (void*)afb_api_dbus_server_expects_event
-};
-
 /* create the service */
 int afb_api_dbus_add_server(const char *path)
 {
@@ -562,7 +564,7 @@ int afb_api_dbus_add_server(const char *path)
 	}
 	INFO("afb service over dbus installed, name %s, path %s", api->name, api->path);
 
-	ctxClientEventListenerAdd(NULL, (struct afb_event_listener){ .itf = &evitf, .closure = api });
+	api->listener = afb_evt_listener_create((void*)afb_api_dbus_server_send_event, api);
 
 	return 0;
 error3: