X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hook.c;h=d2ea0b6667757f5546d7362af2473b4893ee19a8;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=f8b593dfdb2485a56477d9e60884785074b28608;hpb=a2cf84ecde926adeebf09bc2c284401513d3fab3;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hook.c b/src/afb-hook.c
index f8b593df..d2ea0b66 100644
--- a/src/afb-hook.c
+++ b/src/afb-hook.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019 "IoT.bzh"
+ * Copyright (C) 2015-2020 "IoT.bzh"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -217,16 +217,18 @@ static void _hook_xreq_(const struct afb_xreq *xreq, const char *format, ...)
 
 static void hook_xreq_begin_cb(void *closure, const struct afb_hookid *hookid, const struct afb_xreq *xreq)
 {
-	if (!xreq->cred)
+	struct afb_cred *cred = xreq->context.credentials;
+
+	if (!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)"
+			(int)cred->uid,
+			cred->user,
+			(int)cred->gid,
+			(int)cred->pid,
+			cred->label?:"(null)",
+			cred->id?:"(null)"
 		);
 }
 
@@ -1531,7 +1533,7 @@ static void _hook_session_(struct afb_session *session, const char *format, ...)
 
 static void hook_session_create_cb(void *closure, const struct afb_hookid *hookid, struct afb_session *session)
 {
-	_hook_session_(session, "create -> token=%s", afb_session_token(session));
+	_hook_session_(session, "create");
 }
 
 static void hook_session_close_cb(void *closure, const struct afb_hookid *hookid, struct afb_session *session)
@@ -1544,11 +1546,6 @@ static void hook_session_destroy_cb(void *closure, const struct afb_hookid *hook
 	_hook_session_(session, "destroy");
 }
 
-static void hook_session_renew_cb(void *closure, const struct afb_hookid *hookid, struct afb_session *session)
-{
-	_hook_session_(session, "renew -> token=%s", afb_session_token(session));
-}
-
 static void hook_session_addref_cb(void *closure, const struct afb_hookid *hookid, struct afb_session *session)
 {
 	_hook_session_(session, "addref");
@@ -1563,7 +1560,6 @@ static struct afb_hook_session_itf hook_session_default_itf = {
 	.hook_session_create = hook_session_create_cb,
 	.hook_session_close = hook_session_close_cb,
 	.hook_session_destroy = hook_session_destroy_cb,
-	.hook_session_renew = hook_session_renew_cb,
 	.hook_session_addref = hook_session_addref_cb,
 	.hook_session_unref = hook_session_unref_cb
 };
@@ -1605,11 +1601,6 @@ void afb_hook_session_destroy(struct afb_session *session)
 	_HOOK_SESSION_(destroy, session);
 }
 
-void afb_hook_session_renew(struct afb_session *session)
-{
-	_HOOK_SESSION_(renew, session);
-}
-
 void afb_hook_session_addref(struct afb_session *session)
 {
 	_HOOK_SESSION_(addref, session);