X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-xreq.c;h=47f2ec6702a3ec95388f488a4255522420527c50;hb=0891ef4826e347d5554c630b5c0ce73c68f76c9c;hp=5f6c745308902244c597c9262f52fb2c1f51530e;hpb=7a7268a5697b0b988bcabc00390878edee941b4e;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index 5f6c7453..47f2ec67 100644
--- a/src/afb-xreq.c
+++ b/src/afb-xreq.c
@@ -463,7 +463,7 @@ static int xreq_subscribe_eventid_cb(struct afb_request *closure, struct afb_eve
 int afb_xreq_subscribe(struct afb_xreq *xreq, struct afb_eventid *eventid)
 {
 	if (xreq->listener)
-		return afb_evt_add_watch(xreq->listener, eventid);
+		return afb_evt_eventid_add_watch(xreq->listener, eventid);
 	if (xreq->queryitf->subscribe)
 		return xreq->queryitf->subscribe(xreq, eventid);
 	ERROR("no event listener, subscription impossible");
@@ -486,7 +486,7 @@ static int xreq_unsubscribe_eventid_cb(struct afb_request *closure, struct afb_e
 int afb_xreq_unsubscribe(struct afb_xreq *xreq, struct afb_eventid *eventid)
 {
 	if (xreq->listener)
-		return afb_evt_remove_watch(xreq->listener, eventid);
+		return afb_evt_eventid_remove_watch(xreq->listener, eventid);
 	if (xreq->queryitf->unsubscribe)
 		return xreq->queryitf->unsubscribe(xreq, eventid);
 	ERROR("no event listener, unsubscription impossible");
@@ -599,6 +599,12 @@ static void *xreq_context_make_cb(struct afb_request *closure, int replace, void
 	return afb_context_make(&xreq->context, replace, create_value, free_value, create_closure);
 }
 
+static int xreq_get_uid_cb(struct afb_request *closure)
+{
+	struct afb_xreq *xreq = from_request(closure);
+	return xreq->cred && xreq->cred->id ? (int)xreq->cred->uid : -1;
+}
+
 /******************************************************************************/
 
 static struct json_object *xreq_hooked_json_cb(struct afb_request *closure)
@@ -803,6 +809,13 @@ static void *xreq_hooked_context_make_cb(struct afb_request *closure, int replac
 	return afb_hook_xreq_context_make(xreq, replace, create_value, free_value, create_closure, result);
 }
 
+static int xreq_hooked_get_uid_cb(struct afb_request *closure)
+{
+	struct afb_xreq *xreq = from_request(closure);
+	int r = xreq_get_uid_cb(closure);
+	return afb_hook_xreq_get_uid(xreq, r);
+}
+
 /******************************************************************************/
 
 const struct afb_request_itf xreq_itf = {
@@ -831,6 +844,7 @@ const struct afb_request_itf xreq_itf = {
 	.subscribe_eventid = xreq_subscribe_eventid_cb,
 	.unsubscribe_eventid = xreq_unsubscribe_eventid_cb,
 	.subcall_request = xreq_subcall_request_cb,
+	.get_uid = xreq_get_uid_cb,
 };
 
 const struct afb_request_itf xreq_hooked_itf = {
@@ -859,6 +873,7 @@ const struct afb_request_itf xreq_hooked_itf = {
 	.subscribe_eventid = xreq_hooked_subscribe_eventid_cb,
 	.unsubscribe_eventid = xreq_hooked_unsubscribe_eventid_cb,
 	.subcall_request = xreq_hooked_subcall_request_cb,
+	.get_uid = xreq_hooked_get_uid_cb,
 };
 
 /******************************************************************************/