X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hook.c;h=bc33c493da9ddff19b0ba989107c4f4b734460cc;hb=52384789f904e7ebbfb901e15cc62521c9b9468f;hp=efd2e6525892a5283c17e4291eccd3ab8818c837;hpb=3580f1a46e5d1a4d4baab7db790418d6bc35b679;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hook.c b/src/afb-hook.c
index efd2e652..bc33c493 100644
--- a/src/afb-hook.c
+++ b/src/afb-hook.c
@@ -99,8 +99,9 @@ static void hook_xreq_begin_default_cb(void * closure, const struct afb_xreq *xr
 	if (!xreq->cred)
 		_hook_xreq_(xreq, "BEGIN");
 	else
-		_hook_xreq_(xreq, "BEGIN uid=%d gid=%d pid=%d label=%s id=%s",
+		_hook_xreq_(xreq, "BEGIN uid=%d=%s gid=%d pid=%d label=%s id=%s",
 			(int)xreq->cred->uid,
+			xreq->cred->user,
 			(int)xreq->cred->gid,
 			(int)xreq->cred->pid,
 			xreq->cred->label?:"(null)",
@@ -133,16 +134,6 @@ static void hook_xreq_fail_default_cb(void * closure, const struct afb_xreq *xre
 	_hook_xreq_(xreq, "fail(%s, %s)", status, info);
 }
 
-static void hook_xreq_raw_default_cb(void * closure, const struct afb_xreq *xreq, const char *buffer, size_t size)
-{
-	_hook_xreq_(xreq, "raw() -> %.*s", (int)size, buffer);
-}
-
-static void hook_xreq_send_default_cb(void * closure, const struct afb_xreq *xreq, const char *buffer, size_t size)
-{
-	_hook_xreq_(xreq, "send(%.*s)", (int)size, buffer);
-}
-
 static void hook_xreq_context_get_default_cb(void * closure, const struct afb_xreq *xreq, void *value)
 {
 	_hook_xreq_(xreq, "context_get() -> %p", value);
@@ -210,8 +201,6 @@ static struct afb_hook_xreq_itf hook_xreq_default_itf = {
 	.hook_xreq_get = hook_xreq_get_default_cb,
 	.hook_xreq_success = hook_xreq_success_default_cb,
 	.hook_xreq_fail = hook_xreq_fail_default_cb,
-	.hook_xreq_raw = hook_xreq_raw_default_cb,
-	.hook_xreq_send = hook_xreq_send_default_cb,
 	.hook_xreq_context_get = hook_xreq_context_get_default_cb,
 	.hook_xreq_context_set = hook_xreq_context_set_default_cb,
 	.hook_xreq_addref = hook_xreq_addref_default_cb,
@@ -279,17 +268,6 @@ void afb_hook_xreq_fail(const struct afb_xreq *xreq, const char *status, const c
 	_HOOK_XREQ_(fail, xreq, status, info);
 }
 
-const char *afb_hook_xreq_raw(const struct afb_xreq *xreq, const char *buffer, size_t size)
-{
-	_HOOK_XREQ_(raw, xreq, buffer, size);
-	return buffer;
-}
-
-void afb_hook_xreq_send(const struct afb_xreq *xreq, const char *buffer, size_t size)
-{
-	_HOOK_XREQ_(send, xreq, buffer, size);
-}
-
 void *afb_hook_xreq_context_get(const struct afb_xreq *xreq, void *value)
 {
 	_HOOK_XREQ_(context_get, xreq, value);
@@ -356,7 +334,7 @@ int afb_hook_xreq_subcallsync_result(const struct afb_xreq *xreq, int status, st
 }
 
 /******************************************************************************
- * section: 
+ * section: hooking xreqs
  *****************************************************************************/
 
 void afb_hook_init_xreq(struct afb_xreq *xreq)
@@ -583,7 +561,7 @@ static struct afb_hook_ditf_itf hook_ditf_default_itf = {
 };
 
 /******************************************************************************
- * section: hooks for tracing requests
+ * section: hooks for tracing daemon interface (ditf)
  *****************************************************************************/
 
 #define _HOOK_DITF_(what,...)   \
@@ -659,7 +637,7 @@ int afb_hook_ditf_queue_job(const struct afb_ditf *ditf, void (*callback)(int si
 }
 
 /******************************************************************************
- * section: 
+ * section: hooking ditf
  *****************************************************************************/
 
 int afb_hook_flags_ditf(const char *api)