X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-xreq.c;h=842ff199326789f714b1e558b043c314e4e47794;hb=dd4c9c11ba5e1f9068ddd20e06db6dca067f01b9;hp=bc63e0da7379f97b09e996b92a6222c02feacd09;hpb=b0786c465d95ddfd681e98f67a996f5447a96f57;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index bc63e0da..842ff199 100644
--- a/src/afb-xreq.c
+++ b/src/afb-xreq.c
@@ -60,12 +60,9 @@ static inline void xreq_unref(struct afb_xreq *xreq)
 
 /******************************************************************************/
 
-extern const struct afb_req_itf xreq_itf;
-extern const struct afb_req_itf xreq_hooked_itf;
-
 static inline struct afb_req to_req(struct afb_xreq *xreq)
 {
-	return (struct afb_req){ .itf = xreq->hookflags ? &xreq_hooked_itf : &xreq_itf, .closure = xreq };
+	return (struct afb_req){ .itf = xreq->itf, .closure = xreq };
 }
 
 /******************************************************************************/
@@ -927,6 +924,7 @@ void afb_xreq_call_verb_v2(struct afb_xreq *xreq, const struct afb_verb_v2 *verb
 void afb_xreq_init(struct afb_xreq *xreq, const struct afb_xreq_query_itf *queryitf)
 {
 	memset(xreq, 0, sizeof *xreq);
+	xreq->itf = &xreq_hooked_itf; /* hook by default */
 	xreq->refcount = 1;
 	xreq->queryitf = queryitf;
 }
@@ -946,6 +944,8 @@ static void init_hooking(struct afb_xreq *xreq)
 	afb_hook_init_xreq(xreq);
 	if (xreq->hookflags)
 		afb_hook_xreq_begin(xreq);
+	else
+		xreq->itf = &xreq_itf; /* unhook the interface */
 }
 
 /**