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

diff --git a/src/afb-api-dbus.c b/src/afb-api-dbus.c
index eda7985f..7452339b 100644
--- a/src/afb-api-dbus.c
+++ b/src/afb-api-dbus.c
@@ -32,10 +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/";
@@ -399,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)
@@ -446,6 +436,18 @@ static void dbus_req_send(struct dbus_req *dreq, const char *buffer, size_t size
 	dbus_req_reply(dreq, RETRAW, buffer, "");
 }
 
+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,
@@ -456,9 +458,19 @@ const struct afb_req_itf afb_api_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 */