X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-xreq.c;h=cd0b0866a0d24ed91f710c560b8046ee6ff1ba90;hb=052c3aee6362b2e33c060e0fbddd68439bb73dcb;hp=e8a4222615c8628763d18cffba052dc3314810d3;hpb=9b2c70bf87bb3272cb325f3a9ecf69cd0bd53ba8;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index e8a42226..cd0b0866 100644
--- a/src/afb-xreq.c
+++ b/src/afb-xreq.c
@@ -55,16 +55,31 @@ static void vinfo(void *first, void *second, const char *fmt, va_list args, void
 static struct json_object *xreq_json_cb(void *closure)
 {
 	struct afb_xreq *xreq = closure;
-	return xreq->json ? : (xreq->json = xreq->queryitf->json(xreq));
+	if (!xreq->json && xreq->queryitf->json)
+		xreq->json = xreq->queryitf->json(xreq);
+	return xreq->json;
 }
 
 static struct afb_arg xreq_get_cb(void *closure, const char *name)
 {
 	struct afb_xreq *xreq = closure;
+	struct afb_arg arg;
+	struct json_object *object, *value;
+
 	if (xreq->queryitf->get)
-		return xreq->queryitf->get(xreq, name);
-	else
-		return afb_msg_json_get_arg(xreq_json_cb(closure), name);
+		arg = xreq->queryitf->get(xreq, name);
+	else {
+		object = xreq_json_cb(closure);
+		if (json_object_object_get_ex(object, name, &value)) {
+			arg.name = name;
+			arg.value = json_object_get_string(value);
+		} else {
+			arg.name = NULL;
+			arg.value = NULL;
+		}
+		arg.path = NULL;
+	}
+	return arg;
 }
 
 static void xreq_success_cb(void *closure, struct json_object *obj, const char *info)
@@ -94,7 +109,7 @@ static void xreq_fail_cb(void *closure, const char *status, const char *info)
 		if (xreq->queryitf->fail)
 			xreq->queryitf->fail(xreq, status, info);
 		else
-			xreq->queryitf->reply(xreq, 1, afb_msg_json_reply_error(status, info, &xreq->context, NULL));
+			xreq->queryitf->reply(xreq, -1, afb_msg_json_reply_error(status, info, &xreq->context, NULL));
 	}
 }
 
@@ -200,7 +215,7 @@ struct xreq_sync
 	struct json_object *args;
 	struct jobloop *jobloop;
 	struct json_object *result;
-	int iserror;
+	int status;
 };
 
 static void xreq_sync_leave(struct xreq_sync *sync)
@@ -212,11 +227,11 @@ static void xreq_sync_leave(struct xreq_sync *sync)
 	}
 }
 
-static void xreq_sync_reply(void *closure, int iserror, struct json_object *obj)
+static void xreq_sync_reply(void *closure, int status, struct json_object *obj)
 {
 	struct xreq_sync *sync = closure;
 
-	sync->iserror = iserror;
+	sync->status = status;
 	sync->result = json_object_get(obj);
 	xreq_sync_leave(sync);
 }
@@ -229,7 +244,7 @@ static void xreq_sync_enter(int signum, void *closure, struct jobloop *jobloop)
 		sync->jobloop = jobloop;
 		xreq_subcall_cb(sync->caller, sync->api, sync->verb, json_object_get(sync->args), xreq_sync_reply, sync);
 	} else {
-		sync->iserror = 1;
+		sync->status = -1;
 		xreq_sync_leave(sync);
 	}
 }
@@ -246,16 +261,16 @@ static int xreq_subcallsync_cb(void *closure, const char *api, const char *verb,
 	sync.args = args;
 	sync.jobloop = NULL;
 	sync.result = NULL;
-	sync.iserror = 1;
+	sync.status = 0;
 
 	rc = jobs_enter(NULL, 0, xreq_sync_enter, &sync);
 	json_object_put(args);
-	if (rc < 0 || sync.iserror) {
+	if (rc < 0 || sync.status < 0) {
 		*result = sync.result ? : afb_msg_json_internal_error();
-		return 0;
+		return -1;
 	}
 	*result = sync.result;
-	return 1;
+	return 0;
 }
 
 static void xreq_vverbose_cb(void*closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
@@ -264,6 +279,12 @@ static void xreq_vverbose_cb(void*closure, int level, const char *file, int line
 	vverbose(level, file, line, func, fmt, args);
 }
 
+static struct afb_stored_req *xreq_store_cb(void *closure)
+{
+	xreq_addref_cb(closure);
+	return closure;
+}
+
 /******************************************************************************/
 
 static struct json_object *xreq_hooked_json_cb(void *closure)
@@ -370,12 +391,12 @@ struct reply
 	void *closure;
 };
 
-static void xreq_hooked_subcall_reply_cb(void *closure, int iserror, struct json_object *result)
+static void xreq_hooked_subcall_reply_cb(void *closure, int status, struct json_object *result)
 {
 	struct reply *reply = closure;
 	
-	afb_hook_xreq_subcall_result(reply->xreq, iserror, result);
-	reply->callback(reply->closure, iserror, result);
+	afb_hook_xreq_subcall_result(reply->xreq, status, result);
+	reply->callback(reply->closure, status, result);
 	free(reply);
 }
 
@@ -414,6 +435,14 @@ static void xreq_hooked_vverbose_cb(void*closure, int level, const char *file, i
 	va_end(ap);
 }
 
+static struct afb_stored_req *xreq_hooked_store_cb(void *closure)
+{
+	struct afb_xreq *xreq = closure;
+	struct afb_stored_req *r = xreq_store_cb(closure);
+	afb_hook_xreq_store(xreq, r);
+	return r;
+}
+
 /******************************************************************************/
 
 const struct afb_req_itf xreq_itf = {
@@ -433,7 +462,8 @@ const struct afb_req_itf xreq_itf = {
 	.unsubscribe = xreq_unsubscribe_cb,
 	.subcall = xreq_subcall_cb,
 	.subcallsync = xreq_subcallsync_cb,
-	.vverbose = xreq_vverbose_cb
+	.vverbose = xreq_vverbose_cb,
+	.store = xreq_store_cb
 };
 
 const struct afb_req_itf xreq_hooked_itf = {
@@ -453,7 +483,8 @@ const struct afb_req_itf xreq_hooked_itf = {
 	.unsubscribe = xreq_hooked_unsubscribe_cb,
 	.subcall = xreq_hooked_subcall_cb,
 	.subcallsync = xreq_hooked_subcallsync_cb,
-	.vverbose = xreq_hooked_vverbose_cb
+	.vverbose = xreq_hooked_vverbose_cb,
+	.store = xreq_hooked_store_cb
 };
 
 static inline struct afb_req to_req(struct afb_xreq *xreq)
@@ -463,6 +494,14 @@ static inline struct afb_req to_req(struct afb_xreq *xreq)
 
 /******************************************************************************/
 
+struct afb_req afb_xreq_unstore(struct afb_stored_req *sreq)
+{
+	struct afb_xreq *xreq = (struct afb_xreq *)sreq;
+	if (xreq->hookflags)
+		afb_hook_xreq_unstore(xreq);
+	return to_req(xreq);
+}
+
 struct json_object *afb_xreq_json(struct afb_xreq *xreq)
 {
 	return afb_req_json(to_req(xreq));