X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-export.c;h=7fd475abac656bd2a3d65c465596f3f5870c4f2e;hb=7f4444176bd6efaa5e189a148351bab5a72c2853;hp=5688cfee44f6cbc9e848d765c76b883bfab7e0aa;hpb=59cd34b59853f6a47e756d7ab5bc0329f40a471c;p=src%2Fapp-framework-binder.git diff --git a/src/afb-export.c b/src/afb-export.c index 5688cfee..7fd475ab 100644 --- a/src/afb-export.c +++ b/src/afb-export.c @@ -568,10 +568,10 @@ static struct call_req *callreq_create( callreq->xreq.context.validated = 1; copy = (char*)&callreq[1]; memcpy(copy, api, lenapi); - callreq->xreq.api = copy; + callreq->xreq.request.api = copy; copy = ©[lenapi]; memcpy(copy, verb, lenverb); - callreq->xreq.verb = copy; + callreq->xreq.request.verb = copy; callreq->xreq.listener = export->listener; callreq->xreq.json = args; callreq->export = export; @@ -841,13 +841,14 @@ static int api_add_verb_cb( const char *verb, const char *info, void (*callback)(struct afb_request *request), + void *vcbdata, const struct afb_auth *auth, uint32_t session) { struct afb_export *export = from_dynapi(dynapi); if (export->apidyn) - return afb_api_dyn_add_verb(export->apidyn, verb, info, callback, auth, session); + return afb_api_dyn_add_verb(export->apidyn, verb, info, callback, vcbdata, auth, session); errno = EPERM; return -1; @@ -904,11 +905,12 @@ static int hooked_api_add_verb_cb( const char *verb, const char *info, void (*callback)(struct afb_request *request), + void *vcbdata, const struct afb_auth *auth, uint32_t session) { /* TODO */ - return api_add_verb_cb(dynapi, verb, info, callback, auth, session); + return api_add_verb_cb(dynapi, verb, info, callback, vcbdata, auth, session); } static int hooked_api_sub_verb_cb( @@ -1078,6 +1080,7 @@ static struct afb_export *create(struct afb_apiset *apiset, const char *apiname, else { memset(export, 0, sizeof *export); export->apiname = strdup(apiname); + export->dynapi.apiname = export->apiname; export->version = version; export->state = Api_State_Pre_Init; export->session = afb_session_addref(common_session); @@ -1142,6 +1145,7 @@ void afb_export_rename(struct afb_export *export, const char *apiname) { free(export->apiname); export->apiname = strdup(apiname); + export->dynapi.apiname = export->apiname; afb_export_update_hook(export); }