X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fafb-hook.c;h=5786f1940ceb292d6c8e137b6eb856d2862726c2;hb=6f1126ae2c585afc34d0bb06f3763e3a82ee3d37;hp=545673f4103d3b34c2265146dbfa650006141049;hpb=05e0214d821f1a7604b4a0897907f347761b56e6;p=src%2Fapp-framework-binder.git diff --git a/src/afb-hook.c b/src/afb-hook.c index 545673f4..5786f194 100644 --- a/src/afb-hook.c +++ b/src/afb-hook.c @@ -32,6 +32,7 @@ #include "afb-context.h" #include "afb-hook.h" #include "afb-session.h" +#include "afb-cred.h" #include "afb-xreq.h" #include "afb-ditf.h" #include "verbose.h" @@ -95,7 +96,17 @@ static void _hook_xreq_(const struct afb_xreq *xreq, const char *format, ...) static void hook_xreq_begin_default_cb(void * closure, const struct afb_xreq *xreq) { - _hook_xreq_(xreq, "BEGIN"); + if (!xreq->cred) + _hook_xreq_(xreq, "BEGIN"); + else + _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)", + xreq->cred->id?:"(null)" + ); } static void hook_xreq_end_default_cb(void * closure, const struct afb_xreq *xreq) @@ -123,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); @@ -200,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, @@ -269,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);