X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ditf.c;h=66bdb9df146ec0fab4876a29049535437c506011;hb=8a30491d5e60239a338e485311a29c43398726e9;hp=b5a50930b4b6d2e7adbb2d6adf81073837f75cee;hpb=6a325d7f101c986e7329ef912c0458719f95c096;p=src%2Fapp-framework-binder.git diff --git a/src/afb-ditf.c b/src/afb-ditf.c index b5a50930..66bdb9df 100644 --- a/src/afb-ditf.c +++ b/src/afb-ditf.c @@ -29,10 +29,15 @@ #include "afb-ditf.h" #include "afb-evt.h" #include "afb-common.h" +#include "afb-xreq.h" +#include "afb-api.h" +#include "afb-apiset.h" #include "afb-hook.h" #include "jobs.h" #include "verbose.h" +extern struct afb_apiset *main_apiset; + /********************************************** * normal flow **********************************************/ @@ -100,6 +105,17 @@ static int queue_job_cb(void *closure, void (*callback)(int signum, void *arg), return jobs_queue(group, timeout, callback, argument); } +static struct afb_req unstore_req_cb(void *closure, struct afb_stored_req *sreq) +{ + return afb_xreq_unstore(sreq); +} + +static int require_api_cb(void *closure, const char *name, int initialized) +{ + struct afb_api a; + return (initialized ? afb_apiset_get_started : afb_apiset_get)(main_apiset, name, &a); +} + /********************************************** * hooked flow **********************************************/ @@ -179,6 +195,25 @@ static int hooked_queue_job_cb(void *closure, void (*callback)(int signum, void return afb_hook_ditf_queue_job(ditf, callback, argument, group, timeout, r); } +static struct afb_req hooked_unstore_req_cb(void *closure, struct afb_stored_req *sreq) +{ + struct afb_ditf *ditf = closure; + afb_hook_ditf_unstore_req(ditf, sreq); + return unstore_req_cb(closure, sreq); +} + +static int hooked_require_api_cb(void *closure, const char *name, int initialized) +{ + int result; + struct afb_ditf *ditf = closure; + afb_hook_ditf_require_api(ditf, name, initialized); + result = require_api_cb(closure, name, initialized); + return afb_hook_ditf_require_api_result(ditf, name, initialized, result); +} + +/********************************************** +* vectors +**********************************************/ static const struct afb_daemon_itf daemon_itf = { .vverbose_v1 = old_vverbose_cb, .vverbose_v2 = vverbose_cb, @@ -189,7 +224,9 @@ static const struct afb_daemon_itf daemon_itf = { .get_system_bus = afb_common_get_system_bus, .rootdir_get_fd = afb_common_rootdir_get_fd, .rootdir_open_locale = rootdir_open_locale_cb, - .queue_job = queue_job_cb + .queue_job = queue_job_cb, + .unstore_req = unstore_req_cb, + .require_api = require_api_cb }; static const struct afb_daemon_itf hooked_daemon_itf = { @@ -202,7 +239,9 @@ static const struct afb_daemon_itf hooked_daemon_itf = { .get_system_bus = hooked_get_system_bus, .rootdir_get_fd = hooked_rootdir_get_fd, .rootdir_open_locale = hooked_rootdir_open_locale_cb, - .queue_job = hooked_queue_job_cb + .queue_job = hooked_queue_job_cb, + .unstore_req = hooked_unstore_req_cb, + .require_api = hooked_require_api_cb }; void afb_ditf_init_v2(struct afb_ditf *ditf, const char *api, struct afb_binding_data_v2 *data)