From: Arran Cudbard-Bell Date: Wed, 10 Nov 2021 21:17:25 +0000 (-0600) Subject: Remove mctx->instance X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5df19b5158e895ad140afd4172adff3f63c77355;p=thirdparty%2Ffreeradius-server.git Remove mctx->instance It's annoying having the same data twice. There's also tons of places this data is cached --- diff --git a/src/lib/eap_aka_sim/module.c b/src/lib/eap_aka_sim/module.c index d1b7c373ca..1ee11164c4 100644 --- a/src/lib/eap_aka_sim/module.c +++ b/src/lib/eap_aka_sim/module.c @@ -41,7 +41,7 @@ RCSID("$Id$") */ static unlang_action_t mod_encode(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - eap_aka_sim_module_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_module_conf_t); + eap_aka_sim_module_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_module_conf_t); eap_session_t *eap_session = eap_session_get(request->parent); eap_aka_sim_mod_session_t *mod_session = talloc_get_type_abort(eap_session->opaque, eap_aka_sim_mod_session_t); @@ -281,7 +281,7 @@ static unlang_action_t mod_encode(rlm_rcode_t *p_result, module_ctx_t const *mct */ unlang_action_t eap_aka_sim_process(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - eap_aka_sim_module_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_module_conf_t); + eap_aka_sim_module_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_module_conf_t); eap_session_t *eap_session = eap_session_get(request->parent); eap_aka_sim_mod_session_t *mod_session = talloc_get_type_abort(eap_session->opaque, eap_aka_sim_mod_session_t); diff --git a/src/lib/eap_aka_sim/state_machine.c b/src/lib/eap_aka_sim/state_machine.c index 4b4cd532f4..2f79107f19 100644 --- a/src/lib/eap_aka_sim/state_machine.c +++ b/src/lib/eap_aka_sim/state_machine.c @@ -631,7 +631,7 @@ RESUME(store_session) */ RESUME(store_pseudonym) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t); fr_pair_t *vp; fr_pair_t *new; @@ -778,7 +778,7 @@ static unlang_action_t session_and_pseudonym_store(rlm_rcode_t *p_result, module eap_aka_sim_session_t *eap_aka_sim_session, module_method_t next) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); fr_pair_t *vp; fr_pair_t *new; @@ -852,7 +852,7 @@ RESUME(clear_session) */ RESUME(clear_pseudonym) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t); pair_delete_request(attr_eap_aka_sim_next_pseudonym); @@ -894,7 +894,7 @@ static unlang_action_t session_and_pseudonym_clear(rlm_rcode_t *p_result, module eap_aka_sim_session_t *eap_aka_sim_session, module_method_t next) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); if (!fr_cond_assert(next)) return STATE_TRANSITION(common_failure_notification); @@ -1212,7 +1212,7 @@ RESUME(send_eap_failure) */ STATE_GUARD(eap_failure) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t); /* @@ -1257,7 +1257,7 @@ RESUME(recv_common_failure_notification_ack) */ STATE(common_failure_notification) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); fr_pair_t *subtype_vp = NULL; subtype_vp = fr_pair_find_by_da_idx(&request->request_pairs, attr_eap_aka_sim_subtype, 0); @@ -1391,7 +1391,7 @@ RESUME(send_common_failure_notification) */ STATE_GUARD(common_failure_notification) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t); /* @@ -1499,7 +1499,7 @@ RESUME(send_eap_success) */ STATE_GUARD(eap_success) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); STATE_SET(eap_success); @@ -1528,7 +1528,7 @@ RESUME(recv_common_success_notification_ack) */ STATE(common_success_notification) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); /* * Because the server uses the AT_NOTIFICATION code "Success" (32768) to @@ -1606,7 +1606,7 @@ RESUME(send_common_success_notification) */ STATE_GUARD(common_success_notification) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); STATE_SET(common_success_notification); @@ -1699,7 +1699,7 @@ RESUME(recv_common_reauthentication_response) */ STATE(common_reauthentication) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t); fr_pair_t *subtype_vp = NULL; @@ -1940,7 +1940,7 @@ RESUME(send_common_reauthentication_request) */ RESUME(load_pseudonym) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t); pair_delete_request(attr_eap_aka_sim_next_reauth_id); @@ -2001,7 +2001,7 @@ RESUME(load_pseudonym) */ RESUME(load_session) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t); pair_delete_request(attr_session_id); @@ -2066,7 +2066,7 @@ RESUME(load_session) */ STATE_GUARD(common_reauthentication) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t); fr_pair_t *vp = NULL; @@ -2095,7 +2095,7 @@ STATE_GUARD(common_reauthentication) */ RESUME(recv_aka_syncronization_failure) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t); fr_pair_t *vp; @@ -2234,7 +2234,7 @@ RESUME(recv_aka_challenge_response) */ STATE(aka_challenge) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t); fr_pair_t *subtype_vp = NULL; fr_pair_t *vp; @@ -2469,7 +2469,7 @@ RESUME(send_aka_challenge_request) */ STATE_GUARD(aka_challenge) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t); fr_pair_t *vp; @@ -2587,7 +2587,7 @@ RESUME(recv_sim_challenge_response) */ STATE(sim_challenge) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t); fr_pair_t *subtype_vp = NULL; @@ -2709,7 +2709,7 @@ RESUME(send_sim_challenge_request) */ STATE_GUARD(sim_challenge) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t); fr_pair_t *vp; @@ -2777,7 +2777,7 @@ STATE_GUARD(common_challenge) */ RESUME(recv_aka_identity_response) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t); bool user_set_id_req; @@ -2861,7 +2861,7 @@ RESUME(recv_aka_identity_response) */ STATE(aka_identity) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t); fr_pair_t *subtype_vp = NULL; @@ -3006,7 +3006,7 @@ RESUME(send_aka_identity_request) */ STATE_GUARD(aka_identity) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t); STATE_SET(aka_identity); @@ -3043,7 +3043,7 @@ STATE_GUARD(aka_identity) */ RESUME(recv_sim_start_response) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t); bool user_set_id_req; fr_pair_t *identity_type; @@ -3164,7 +3164,7 @@ RESUME(recv_sim_start_response) */ STATE(sim_start) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t); fr_pair_t *subtype_vp = NULL; @@ -3337,7 +3337,7 @@ RESUME(send_sim_start) */ STATE_GUARD(sim_start) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t); STATE_SET(sim_start); @@ -3389,7 +3389,7 @@ STATE_GUARD(common_identity) */ RESUME(recv_common_identity_response) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t); fr_pair_t *eap_type, *method, *identity_type; fr_aka_sim_method_hint_t running, hinted; @@ -3544,7 +3544,7 @@ RESUME(recv_common_identity_response) STATE(init) { eap_session_t *eap_session = eap_session_get(request->parent); - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t); fr_pair_t *vp; fr_aka_sim_id_type_t type; @@ -3603,7 +3603,7 @@ static int _eap_aka_sim_session_free(eap_aka_sim_session_t *eap_aka_sim_session) */ unlang_action_t eap_aka_sim_state_machine_process(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->instance, eap_aka_sim_process_conf_t); + eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t); eap_aka_sim_session_t *eap_aka_sim_session = request_data_reference(request, (void *)eap_aka_sim_state_machine_process, 0); diff --git a/src/lib/server/auth.c b/src/lib/server/auth.c index 019f6d344e..12b88d6078 100644 --- a/src/lib/server/auth.c +++ b/src/lib/server/auth.c @@ -168,7 +168,7 @@ unlang_action_t rad_virtual_server(rlm_rcode_t *p_result, request_t *request) } RDEBUG("server %s {", cf_section_name2(unlang_call_current(request))); - request->async->process(&final, &(module_ctx_t){ .instance = request->async->process_inst }, request); + request->async->process(&final, &(module_ctx_t){ .inst = dl_module_instance_by_data(request->async->process_inst) }, request); RDEBUG("} # server %s", cf_section_name2(unlang_call_current(request))); fr_cond_assert(final == RLM_MODULE_OK); diff --git a/src/lib/server/module.h b/src/lib/server/module.h index f66b962f23..8f46855578 100644 --- a/src/lib/server/module.h +++ b/src/lib/server/module.h @@ -265,8 +265,7 @@ typedef struct { * */ struct module_ctx_s { - dl_module_inst_t *dl_inst; //!< dl API handle for the module. - void *instance; //!< Global instance data for the module. + dl_module_inst_t const *inst; //!< Dynamic loader API handle for the module. void *thread; //!< Thread specific instance data. void *rctx; //!< Resume ctx that a module previously set. }; diff --git a/src/lib/server/process.h b/src/lib/server/process.h index 0917b6b8ad..d44127ccbe 100644 --- a/src/lib/server/process.h +++ b/src/lib/server/process.h @@ -153,7 +153,7 @@ RECV(generic) { CONF_SECTION *cs; fr_process_state_t const *state; - PROCESS_INST const *inst = mctx->instance; + PROCESS_INST const *inst = mctx->inst->data; PROCESS_TRACE; @@ -183,7 +183,7 @@ RESUME(recv_generic) rlm_rcode_t rcode = *p_result; CONF_SECTION *cs; fr_process_state_t const *state; - PROCESS_INST const *inst = mctx->instance; + PROCESS_INST const *inst = mctx->inst->data; PROCESS_TRACE; @@ -234,7 +234,7 @@ SEND(generic) fr_pair_t *vp; CONF_SECTION *cs; fr_process_state_t const *state; - PROCESS_INST const *inst = mctx->instance; + PROCESS_INST const *inst = mctx->inst->data; PROCESS_TRACE; @@ -296,7 +296,7 @@ RESUME(send_generic) rlm_rcode_t rcode = *p_result; CONF_SECTION *cs; fr_process_state_t const *state; - PROCESS_INST const *inst = mctx->instance; + PROCESS_INST const *inst = mctx->inst->data; PROCESS_TRACE; diff --git a/src/lib/unlang/module.c b/src/lib/unlang/module.c index 0b6ce0efbc..238db6ef29 100644 --- a/src/lib/unlang/module.c +++ b/src/lib/unlang/module.c @@ -68,8 +68,7 @@ static void unlang_event_fd_read_handler(UNUSED fr_event_list_t *el, int fd, UNU fr_assert(ev->fd == fd); ev->fd_read(&(module_ctx_t){ - .dl_inst = ev->dl_inst, - .instance = ev->dl_inst->data, + .inst = ev->dl_inst, .thread = ev->thread, .rctx = UNCONST(void *, ev->ctx) }, ev->request, fd); @@ -110,8 +109,7 @@ static void unlang_module_event_timeout_handler(UNUSED fr_event_list_t *el, fr_t unlang_module_event_t *ev = talloc_get_type_abort(ctx, unlang_module_event_t); ev->timeout(&(module_ctx_t){ - .dl_inst = ev->dl_inst, - .instance = ev->dl_inst->data, + .inst = ev->dl_inst, .thread = ev->thread, .rctx = UNCONST(void *, ev->ctx) }, ev->request, now); @@ -205,8 +203,7 @@ static void unlang_event_fd_write_handler(UNUSED fr_event_list_t *el, int fd, UN fr_assert(ev->fd == fd); ev->fd_write(&(module_ctx_t){ - .dl_inst = ev->dl_inst, - .instance = ev->dl_inst->data, + .inst = ev->dl_inst, .thread = ev->thread, .rctx = UNCONST(void *, ev->ctx) }, ev->request, fd); @@ -228,8 +225,7 @@ static void unlang_event_fd_error_handler(UNUSED fr_event_list_t *el, int fd, fr_assert(ev->fd == fd); ev->fd_error(&(module_ctx_t){ - .dl_inst = ev->dl_inst, - .instance = ev->dl_inst->data, + .inst = ev->dl_inst, .thread = ev->thread, .rctx = UNCONST(void *, ev->ctx) }, ev->request, fd); @@ -552,7 +548,7 @@ unlang_action_t unlang_module_yield_to_section(rlm_rcode_t *p_result, return resume(p_result, &(module_ctx_t){ - .instance = mc->instance->dl_inst->data, + .inst = mc->instance->dl_inst, .thread = module_thread(mc->instance)->data, .rctx = rctx }, request); @@ -649,8 +645,7 @@ static void unlang_module_signal(request_t *request, unlang_stack_frame_t *frame request->module = mc->instance->name; safe_lock(mc->instance); state->signal(&(module_ctx_t){ - .dl_inst = mc->instance->dl_inst, - .instance = mc->instance->dl_inst->data, + .inst = mc->instance->dl_inst, .thread = state->thread->data, .rctx = state->rctx }, @@ -748,8 +743,7 @@ static unlang_action_t unlang_module_resume(rlm_rcode_t *p_result, request_t *re safe_lock(mc->instance); ua = resume(&state->rcode, &(module_ctx_t){ - .dl_inst = mc->instance->dl_inst, - .instance = mc->instance->dl_inst->data, + .inst = mc->instance->dl_inst, .thread = state->thread->data, .rctx = state->rctx, }, request); @@ -958,8 +952,7 @@ static unlang_action_t unlang_module(rlm_rcode_t *p_result, request_t *request, safe_lock(mc->instance); /* Noop unless instance->mutex set */ ua = mc->method(&state->rcode, &(module_ctx_t){ - .dl_inst = mc->instance->dl_inst, - .instance = mc->instance->dl_inst->data, + .inst = mc->instance->dl_inst, .thread = state->thread->data }, request); diff --git a/src/modules/rlm_always/rlm_always.c b/src/modules/rlm_always/rlm_always.c index 0548621b8e..068eb8e35b 100644 --- a/src/modules/rlm_always/rlm_always.c +++ b/src/modules/rlm_always/rlm_always.c @@ -166,7 +166,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf) */ static unlang_action_t CC_HINT(nonnull) mod_always_return(rlm_rcode_t *p_result, module_ctx_t const *mctx, UNUSED request_t *request) { - rlm_always_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_always_t); + rlm_always_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_always_t); RETURN_MODULE_RCODE(inst->rcode); } diff --git a/src/modules/rlm_attr_filter/rlm_attr_filter.c b/src/modules/rlm_attr_filter/rlm_attr_filter.c index a451826b93..288a5b2a15 100644 --- a/src/modules/rlm_attr_filter/rlm_attr_filter.c +++ b/src/modules/rlm_attr_filter/rlm_attr_filter.c @@ -369,7 +369,7 @@ static unlang_action_t CC_HINT(nonnull(1,2)) attr_filter_common(rlm_rcode_t *p_r #define RLM_AF_FUNC(_x, _y, _z) static unlang_action_t CC_HINT(nonnull) mod_##_x(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) \ { \ - return attr_filter_common(p_result, mctx->instance, request, request->_y, &request->_z##_pairs); \ + return attr_filter_common(p_result, mctx->inst->data, request, request->_y, &request->_z##_pairs); \ } RLM_AF_FUNC(authorize, packet, request) diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c index 6a51e6fe89..fd37db185e 100644 --- a/src/modules/rlm_cache/rlm_cache.c +++ b/src/modules/rlm_cache/rlm_cache.c @@ -534,7 +534,7 @@ static int cache_verify(map_t *map, void *ctx) static unlang_action_t CC_HINT(nonnull) mod_cache_it(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { rlm_cache_entry_t *c = NULL; - rlm_cache_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_cache_t); + rlm_cache_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_cache_t); rlm_cache_handle_t *handle; @@ -1076,7 +1076,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf) */ static unlang_action_t CC_HINT(nonnull) mod_method_status(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_cache_t const *inst = talloc_get_type_abort(mctx->instance, rlm_cache_t); + rlm_cache_t const *inst = talloc_get_type_abort(mctx->inst->data, rlm_cache_t); rlm_rcode_t rcode = RLM_MODULE_NOOP; uint8_t buffer[1024]; uint8_t const *key; @@ -1124,7 +1124,7 @@ finish: */ static unlang_action_t CC_HINT(nonnull) mod_method_load(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_cache_t const *inst = talloc_get_type_abort(mctx->instance, rlm_cache_t); + rlm_cache_t const *inst = talloc_get_type_abort(mctx->inst->data, rlm_cache_t); rlm_rcode_t rcode = RLM_MODULE_NOOP; uint8_t buffer[1024]; uint8_t const *key; @@ -1176,7 +1176,7 @@ finish: */ static unlang_action_t CC_HINT(nonnull) mod_method_store(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_cache_t const *inst = talloc_get_type_abort(mctx->instance, rlm_cache_t); + rlm_cache_t const *inst = talloc_get_type_abort(mctx->inst->data, rlm_cache_t); rlm_rcode_t rcode = RLM_MODULE_NOOP; uint8_t buffer[1024]; uint8_t const *key; @@ -1276,7 +1276,7 @@ finish: */ static unlang_action_t CC_HINT(nonnull) mod_method_clear(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_cache_t const *inst = talloc_get_type_abort(mctx->instance, rlm_cache_t); + rlm_cache_t const *inst = talloc_get_type_abort(mctx->inst->data, rlm_cache_t); rlm_rcode_t rcode = RLM_MODULE_NOOP; uint8_t buffer[1024]; uint8_t const *key; @@ -1328,7 +1328,7 @@ finish: */ static unlang_action_t CC_HINT(nonnull) mod_method_ttl(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_cache_t const *inst = talloc_get_type_abort(mctx->instance, rlm_cache_t); + rlm_cache_t const *inst = talloc_get_type_abort(mctx->inst->data, rlm_cache_t); rlm_rcode_t rcode = RLM_MODULE_NOOP; uint8_t buffer[1024]; uint8_t const *key; diff --git a/src/modules/rlm_chap/rlm_chap.c b/src/modules/rlm_chap/rlm_chap.c index 45dfdc40ac..aadbd2e615 100644 --- a/src/modules/rlm_chap/rlm_chap.c +++ b/src/modules/rlm_chap/rlm_chap.c @@ -111,7 +111,7 @@ static xlat_action_t xlat_func_chap_password(TALLOC_CTX *ctx, fr_dcursor_t *out, static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { fr_pair_t *vp; - rlm_chap_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_chap_t); + rlm_chap_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_chap_t); if (fr_pair_find_by_da_idx(&request->control_pairs, attr_auth_type, 0) != NULL) { RDEBUG3("Auth-Type is already set. Not setting 'Auth-Type := %s'", inst->name); diff --git a/src/modules/rlm_couchbase/rlm_couchbase.c b/src/modules/rlm_couchbase/rlm_couchbase.c index 6299f8ae2b..27baacd68f 100644 --- a/src/modules/rlm_couchbase/rlm_couchbase.c +++ b/src/modules/rlm_couchbase/rlm_couchbase.c @@ -98,7 +98,7 @@ fr_dict_attr_autoload_t rlm_couchbase_dict_attr[] = { */ static unlang_action_t mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_couchbase_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_couchbase_t); /* our module instance */ + rlm_couchbase_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_couchbase_t); /* our module instance */ rlm_couchbase_handle_t *handle = NULL; /* connection pool handle */ char buffer[MAX_KEY_SIZE]; char const *dockey; /* our document key */ @@ -233,7 +233,7 @@ finish: */ static unlang_action_t mod_accounting(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_couchbase_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_couchbase_t); /* our module instance */ + rlm_couchbase_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_couchbase_t); /* our module instance */ rlm_couchbase_handle_t *handle = NULL; /* connection pool handle */ rlm_rcode_t rcode = RLM_MODULE_OK; /* return code */ fr_pair_t *vp; /* radius value pair linked list */ diff --git a/src/modules/rlm_csv/rlm_csv.c b/src/modules/rlm_csv/rlm_csv.c index 8237740fc5..ea425ae2a0 100644 --- a/src/modules/rlm_csv/rlm_csv.c +++ b/src/modules/rlm_csv/rlm_csv.c @@ -1001,7 +1001,7 @@ static rlm_rcode_t mod_map_proc(void *mod_inst, UNUSED void *proc_inst, request_ static unlang_action_t CC_HINT(nonnull) mod_process(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_csv_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_csv_t); + rlm_csv_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_csv_t); rlm_rcode_t rcode; ssize_t slen; fr_value_box_t *key; diff --git a/src/modules/rlm_delay/rlm_delay.c b/src/modules/rlm_delay/rlm_delay.c index b61fa74090..5e626ae7e7 100644 --- a/src/modules/rlm_delay/rlm_delay.c +++ b/src/modules/rlm_delay/rlm_delay.c @@ -140,7 +140,7 @@ static void mod_delay_cancel(module_ctx_t const *mctx, request_t *request, fr_st static unlang_action_t CC_HINT(nonnull) mod_delay(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_delay_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_delay_t); + rlm_delay_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_delay_t); fr_time_delta_t delay; fr_time_t resume_at, *yielded_at; diff --git a/src/modules/rlm_detail/rlm_detail.c b/src/modules/rlm_detail/rlm_detail.c index 8962f445f0..5c75bfb3be 100644 --- a/src/modules/rlm_detail/rlm_detail.c +++ b/src/modules/rlm_detail/rlm_detail.c @@ -374,7 +374,7 @@ static unlang_action_t CC_HINT(nonnull) detail_do(rlm_rcode_t *p_result, module_ char *endptr; #endif - rlm_detail_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_detail_t); + rlm_detail_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_detail_t); /* * Generate the path for the detail file. Use the same diff --git a/src/modules/rlm_digest/rlm_digest.c b/src/modules/rlm_digest/rlm_digest.c index 24db01f231..ac9706433c 100644 --- a/src/modules/rlm_digest/rlm_digest.c +++ b/src/modules/rlm_digest/rlm_digest.c @@ -86,7 +86,7 @@ fr_dict_attr_autoload_t rlm_digest_dict_attr[] = { static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_digest_t const *inst = talloc_get_type_abort(mctx->instance, rlm_digest_t); + rlm_digest_t const *inst = talloc_get_type_abort(mctx->inst->data, rlm_digest_t); fr_pair_t *vp; /* diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c index 760c6adf6a..d6deae62f7 100644 --- a/src/modules/rlm_eap/rlm_eap.c +++ b/src/modules/rlm_eap/rlm_eap.c @@ -248,7 +248,7 @@ static eap_type_t eap_process_nak(module_ctx_t const *mctx, request_t *request, eap_type_t type, eap_type_data_t *nak) { - rlm_eap_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_eap_t); + rlm_eap_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_eap_t); unsigned int i; fr_pair_t *vp; eap_type_t method = FR_EAP_METHOD_INVALID; @@ -539,7 +539,7 @@ static ssize_t eap_identity_is_nai_with_realm(char const *identity) */ static unlang_action_t eap_method_select(rlm_rcode_t *p_result, module_ctx_t const *mctx, eap_session_t *eap_session) { - rlm_eap_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_eap_t); + rlm_eap_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_eap_t); eap_type_data_t *type = &eap_session->this_round->response->type; request_t *request = eap_session->request; @@ -807,7 +807,7 @@ static unlang_action_t eap_method_select(rlm_rcode_t *p_result, module_ctx_t con static unlang_action_t mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_eap_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_eap_t); + rlm_eap_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_eap_t); eap_session_t *eap_session; eap_packet_raw_t *eap_packet; unlang_action_t ua; @@ -872,7 +872,7 @@ static unlang_action_t mod_authenticate(rlm_rcode_t *p_result, module_ctx_t cons */ static unlang_action_t mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_eap_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_eap_t); + rlm_eap_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_eap_t); int status; #ifdef WITH_PROXY @@ -920,7 +920,7 @@ static unlang_action_t mod_authorize(rlm_rcode_t *p_result, module_ctx_t const * static unlang_action_t mod_post_auth(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_eap_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_eap_t); + rlm_eap_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_eap_t); fr_pair_t *vp; eap_session_t *eap_session; fr_pair_t *username; diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c b/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c index 3e512866ad..c920718ef9 100644 --- a/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c +++ b/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c @@ -524,7 +524,7 @@ static unlang_action_t mod_handshake_process(UNUSED rlm_rcode_t *p_result, UNUSE */ static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_eap_fast_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_eap_fast_t); + rlm_eap_fast_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_eap_fast_t); rlm_eap_fast_thread_t *thread = talloc_get_type_abort(mctx->thread, rlm_eap_fast_thread_t); eap_session_t *eap_session = eap_session_get(request->parent); eap_tls_session_t *eap_tls_session; diff --git a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c index 4b0b536db5..8797c6da64 100644 --- a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c +++ b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c @@ -124,7 +124,7 @@ static unlang_action_t mod_process_auth_type(rlm_rcode_t *p_result, UNUSED modul */ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_eap_gtc_t const *inst = talloc_get_type_abort(mctx->instance, rlm_eap_gtc_t); + rlm_eap_gtc_t const *inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_gtc_t); rlm_rcode_t rcode; eap_session_t *eap_session = eap_session_get(request->parent); @@ -200,7 +200,7 @@ static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t cons char challenge_str[1024]; int length; eap_round_t *eap_round = eap_session->this_round; - rlm_eap_gtc_t *inst = talloc_get_type_abort(mctx->instance, rlm_eap_gtc_t); + rlm_eap_gtc_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_gtc_t); if (xlat_eval(challenge_str, sizeof(challenge_str), request, inst->challenge, NULL, NULL) < 0) { RETURN_MODULE_FAIL; diff --git a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c index 76615c566e..9d60d925bc 100644 --- a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c +++ b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c @@ -354,7 +354,7 @@ static unlang_action_t mschap_finalize(rlm_rcode_t *p_result, module_ctx_t const mschapv2_opaque_t *data = talloc_get_type_abort(eap_session->opaque, mschapv2_opaque_t); eap_round_t *eap_round = eap_session->this_round; fr_pair_list_t response; - rlm_eap_mschapv2_t const *inst = mctx->instance; + rlm_eap_mschapv2_t const *inst = mctx->inst->data; fr_pair_list_init(&response); /* @@ -450,7 +450,7 @@ static unlang_action_t mod_process_auth_type(rlm_rcode_t *p_result, module_ctx_t */ static unlang_action_t CC_HINT(nonnull) mod_process(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_eap_mschapv2_t const *inst = talloc_get_type_abort(mctx->instance, rlm_eap_mschapv2_t); + rlm_eap_mschapv2_t const *inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_mschapv2_t); request_t *parent = request->parent; eap_session_t *eap_session = eap_session_get(parent); mschapv2_opaque_t *data = talloc_get_type_abort(eap_session->opaque, mschapv2_opaque_t); @@ -697,7 +697,7 @@ packet_ready: */ tunnel = talloc_zero(request, eap_tunnel_data_t); - tunnel->tls_session = mctx->instance; + tunnel->tls_session = mctx->inst->data; tunnel->callback = mschap_postproxy; /* @@ -778,7 +778,7 @@ static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t cons int i; bool created_auth_challenge; - if (!fr_cond_assert(mctx->instance)) RETURN_MODULE_FAIL; + if (!fr_cond_assert(mctx->inst->data)) RETURN_MODULE_FAIL; /* * We're looking for attributes that should come @@ -847,7 +847,7 @@ static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t cons * Compose the EAP-MSCHAPV2 packet out of the data structure, * and free it. */ - eap_mschapv2_compose(mctx->instance, request, eap_session, auth_challenge); + eap_mschapv2_compose(mctx->inst->data, request, eap_session, auth_challenge); if (created_auth_challenge) TALLOC_FREE(auth_challenge); #ifdef WITH_PROXY diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c index 232deca457..66dfa75939 100644 --- a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c +++ b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c @@ -126,7 +126,7 @@ static peap_tunnel_t *peap_alloc(TALLOC_CTX *ctx, rlm_eap_peap_t *inst) static unlang_action_t mod_handshake_resume(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_eap_peap_t *inst = talloc_get_type(mctx->instance, rlm_eap_peap_t); + rlm_eap_peap_t *inst = talloc_get_type(mctx->inst->data, rlm_eap_peap_t); rlm_rcode_t rcode; @@ -282,7 +282,7 @@ static unlang_action_t mod_handshake_process(UNUSED rlm_rcode_t *p_result, UNUSE */ static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_eap_peap_t *inst = talloc_get_type_abort(mctx->instance, rlm_eap_peap_t); + rlm_eap_peap_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_peap_t); rlm_eap_peap_thread_t *t = talloc_get_type_abort(mctx->thread, rlm_eap_peap_thread_t); eap_session_t *eap_session = eap_session_get(request->parent); eap_tls_session_t *eap_tls_session; diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c index b65404103a..5ac2ba424a 100644 --- a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c +++ b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c @@ -154,7 +154,7 @@ static int send_pwd_request(request_t *request, pwd_session_t *session, eap_roun static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_eap_pwd_t *inst = talloc_get_type_abort(mctx->instance, rlm_eap_pwd_t); + rlm_eap_pwd_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_pwd_t); eap_session_t *eap_session = eap_session_get(request->parent); pwd_session_t *session; @@ -486,7 +486,7 @@ static int _free_pwd_session(pwd_session_t *session) static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_eap_pwd_t *inst = talloc_get_type_abort(mctx->instance, rlm_eap_pwd_t); + rlm_eap_pwd_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_pwd_t); eap_session_t *eap_session = eap_session_get(request->parent); pwd_session_t *session; fr_pair_t *vp; diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c index 0771b251b2..dee63f34a2 100644 --- a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c +++ b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c @@ -179,7 +179,7 @@ static unlang_action_t mod_handshake_process(UNUSED rlm_rcode_t *p_result, UNUSE */ static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_eap_tls_t *inst = talloc_get_type_abort(mctx->instance, rlm_eap_tls_t); + rlm_eap_tls_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_tls_t); rlm_eap_tls_thread_t *t = talloc_get_type_abort(mctx->thread, rlm_eap_tls_thread_t); eap_session_t *eap_session = eap_session_get(request->parent); eap_tls_session_t *eap_tls_session; diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c index f2f9faea5c..881fcbf74a 100644 --- a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c +++ b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c @@ -285,7 +285,7 @@ static unlang_action_t mod_handshake_process(UNUSED rlm_rcode_t *p_result, UNUSE */ static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_eap_ttls_t *inst = talloc_get_type_abort(mctx->instance, rlm_eap_ttls_t); + rlm_eap_ttls_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_ttls_t); rlm_eap_ttls_thread_t *t = talloc_get_type_abort(mctx->thread, rlm_eap_ttls_thread_t); eap_session_t *eap_session = eap_session_get(request->parent); diff --git a/src/modules/rlm_exec/rlm_exec.c b/src/modules/rlm_exec/rlm_exec.c index c051563043..b73e05de6b 100644 --- a/src/modules/rlm_exec/rlm_exec.c +++ b/src/modules/rlm_exec/rlm_exec.c @@ -281,7 +281,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf) static unlang_action_t mod_exec_nowait_resume(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_exec_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_exec_t); + rlm_exec_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_exec_t); fr_value_box_list_t *box = talloc_get_type_abort(mctx->rctx, fr_value_box_list_t); fr_pair_list_t *env_pairs = NULL; @@ -369,7 +369,7 @@ static rlm_rcode_t rlm_exec_status2rcode(request_t *request, fr_value_box_t *box static unlang_action_t mod_exec_wait_resume(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { int status; - rlm_exec_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_exec_t); + rlm_exec_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_exec_t); rlm_exec_ctx_t *m = talloc_get_type_abort(mctx->rctx, rlm_exec_ctx_t); rlm_rcode_t rcode; @@ -421,7 +421,7 @@ static unlang_action_t mod_exec_wait_resume(rlm_rcode_t *p_result, module_ctx_t */ static unlang_action_t CC_HINT(nonnull) mod_exec_dispatch(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_exec_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_exec_t); + rlm_exec_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_exec_t); rlm_exec_ctx_t *m; fr_pair_list_t *env_pairs = NULL; TALLOC_CTX *ctx; diff --git a/src/modules/rlm_files/rlm_files.c b/src/modules/rlm_files/rlm_files.c index a58789516b..503d24bd41 100644 --- a/src/modules/rlm_files/rlm_files.c +++ b/src/modules/rlm_files/rlm_files.c @@ -624,7 +624,7 @@ redo: */ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_files_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_files_t); + rlm_files_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_files_t); return file_common(p_result, inst, request, inst->filename, inst->users ? inst->users : inst->common, @@ -639,7 +639,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod */ static unlang_action_t CC_HINT(nonnull) mod_preacct(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_files_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_files_t); + rlm_files_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_files_t); return file_common(p_result, inst, request, inst->acct_usersfile, inst->acct_users ? inst->acct_users : inst->common, @@ -648,7 +648,7 @@ static unlang_action_t CC_HINT(nonnull) mod_preacct(rlm_rcode_t *p_result, modul static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_files_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_files_t); + rlm_files_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_files_t); return file_common(p_result, inst, request, inst->auth_usersfile, inst->auth_users ? inst->auth_users : inst->common, @@ -657,7 +657,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, static unlang_action_t CC_HINT(nonnull) mod_post_auth(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_files_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_files_t); + rlm_files_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_files_t); return file_common(p_result, inst, request, inst->postauth_usersfile, inst->postauth_users ? inst->postauth_users : inst->common, diff --git a/src/modules/rlm_imap/rlm_imap.c b/src/modules/rlm_imap/rlm_imap.c index 6443e8d8c5..ba103d80b9 100644 --- a/src/modules/rlm_imap/rlm_imap.c +++ b/src/modules/rlm_imap/rlm_imap.c @@ -75,7 +75,7 @@ static const CONF_PARSER module_config[] = { static unlang_action_t CC_HINT(nonnull) mod_authenticate_resume(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_imap_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_imap_t); + rlm_imap_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_imap_t); fr_curl_io_request_t *randle = talloc_get_type_abort(mctx->rctx, fr_curl_io_request_t); fr_curl_tls_t const *tls; long curl_out; @@ -114,7 +114,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate_resume(rlm_rcode_t *p_r */ static unlang_action_t CC_HINT(nonnull(1,2)) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_imap_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_imap_t); + rlm_imap_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_imap_t); rlm_imap_thread_t *t = talloc_get_type_abort(mctx->thread, rlm_imap_thread_t); fr_pair_t const *username; diff --git a/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c b/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c index fec97f255a..a06bcfcd11 100644 --- a/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c +++ b/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c @@ -2211,7 +2211,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf) static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_isc_dhcp_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_isc_dhcp_t); + rlm_isc_dhcp_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_isc_dhcp_t); int ret; ret = apply_fixed_ip(inst, request); @@ -2225,7 +2225,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod static unlang_action_t CC_HINT(nonnull) mod_post_auth(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_isc_dhcp_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_isc_dhcp_t); + rlm_isc_dhcp_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_isc_dhcp_t); int ret; ret = apply(inst, request, inst->head); diff --git a/src/modules/rlm_krb5/rlm_krb5.c b/src/modules/rlm_krb5/rlm_krb5.c index 65555cc352..20ef7deb42 100644 --- a/src/modules/rlm_krb5/rlm_krb5.c +++ b/src/modules/rlm_krb5/rlm_krb5.c @@ -320,7 +320,7 @@ static rlm_rcode_t krb5_process_error(rlm_krb5_t const *inst, request_t *request */ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_krb5_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_krb5_t); + rlm_krb5_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_krb5_t); rlm_rcode_t rcode; krb5_error_code ret; rlm_krb5_handle_t *conn; @@ -411,7 +411,7 @@ cleanup: */ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_krb5_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_krb5_t); + rlm_krb5_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_krb5_t); rlm_rcode_t rcode; krb5_error_code ret; diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c index 0a9c5096a4..a4bcedac59 100644 --- a/src/modules/rlm_ldap/rlm_ldap.c +++ b/src/modules/rlm_ldap/rlm_ldap.c @@ -1043,7 +1043,7 @@ cleanup: static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_ldap_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_ldap_t); + rlm_ldap_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_ldap_t); fr_ldap_thread_t *thread = talloc_get_type_abort(module_thread_by_data(inst)->data, fr_ldap_thread_t); rlm_rcode_t rcode; char const *dn; @@ -1225,7 +1225,7 @@ static unlang_action_t rlm_ldap_map_profile(rlm_rcode_t *p_result, rlm_ldap_t co static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_ldap_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_ldap_t); + rlm_ldap_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_ldap_t); fr_ldap_thread_t *thread = talloc_get_type_abort(module_thread_by_data(inst)->data, fr_ldap_thread_t); rlm_rcode_t rcode = RLM_MODULE_OK; int ldap_errno; @@ -1677,7 +1677,7 @@ error: static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_ldap_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_ldap_t); + rlm_ldap_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_ldap_t); if (inst->accounting) return user_modify(p_result, inst, request, inst->accounting); @@ -1686,7 +1686,7 @@ static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, mo static unlang_action_t CC_HINT(nonnull) mod_post_auth(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_ldap_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_ldap_t); + rlm_ldap_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_ldap_t); if (inst->postauth) return user_modify(p_result, inst, request, inst->postauth); diff --git a/src/modules/rlm_linelog/rlm_linelog.c b/src/modules/rlm_linelog/rlm_linelog.c index bdf5cb1024..ad8b6fa4db 100644 --- a/src/modules/rlm_linelog/rlm_linelog.c +++ b/src/modules/rlm_linelog/rlm_linelog.c @@ -449,7 +449,7 @@ static size_t linelog_escape_func(UNUSED request_t *request, */ static unlang_action_t CC_HINT(nonnull) mod_do_linelog(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_linelog_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_linelog_t); + rlm_linelog_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_linelog_t); linelog_conn_t *conn; fr_time_delta_t timeout = fr_time_delta_wrap(0); char buff[4096]; diff --git a/src/modules/rlm_logintime/rlm_logintime.c b/src/modules/rlm_logintime/rlm_logintime.c index 63744b1a20..7b99a17342 100644 --- a/src/modules/rlm_logintime/rlm_logintime.c +++ b/src/modules/rlm_logintime/rlm_logintime.c @@ -155,7 +155,7 @@ static int time_of_day(UNUSED void *instance, request_t *request, */ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_logintime_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_logintime_t); + rlm_logintime_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_logintime_t); fr_pair_t *ends, *vp; fr_time_delta_t left; diff --git a/src/modules/rlm_lua/lua.c b/src/modules/rlm_lua/lua.c index 3222f7f486..65d21ac42d 100644 --- a/src/modules/rlm_lua/lua.c +++ b/src/modules/rlm_lua/lua.c @@ -739,7 +739,7 @@ static void _lua_fr_request_register(lua_State *L, request_t *request) unlang_action_t fr_lua_run(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request, char const *funcname) { - rlm_lua_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_lua_t); + rlm_lua_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_lua_t); rlm_lua_thread_t *thread = talloc_get_type_abort(mctx->thread, rlm_lua_thread_t); lua_State *L = thread->interpreter; rlm_rcode_t rcode = RLM_MODULE_OK; diff --git a/src/modules/rlm_lua/rlm_lua.c b/src/modules/rlm_lua/rlm_lua.c index 65ef8d8ca1..0476921887 100644 --- a/src/modules/rlm_lua/rlm_lua.c +++ b/src/modules/rlm_lua/rlm_lua.c @@ -58,7 +58,7 @@ static const CONF_PARSER module_config[] = { #define DO_LUA(_s)\ static unlang_action_t mod_##_s(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) \ {\ - rlm_lua_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_lua_t);\ + rlm_lua_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_lua_t);\ if (!inst->func_##_s) RETURN_MODULE_NOOP;\ return fr_lua_run(p_result, mctx, request, inst->func_##_s);\ } @@ -119,7 +119,7 @@ static int mod_detach(void *instance) if (inst->interpreter) { if (inst->func_detach) { fr_lua_run(&ret, &(module_ctx_t){ - .instance = inst, + .inst = dl_module_instance_by_data(instance), .thread = &(rlm_lua_thread_t){ .interpreter = inst->interpreter } @@ -151,7 +151,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf) if (inst->func_instantiate) { fr_lua_run(&rcode, &(module_ctx_t){ - .instance = inst, + .inst = dl_module_instance_by_data(instance), .thread = &(rlm_lua_thread_t){ .interpreter = inst->interpreter } diff --git a/src/modules/rlm_mruby/rlm_mruby.c b/src/modules/rlm_mruby/rlm_mruby.c index 21b3d9e8a1..102ed0bd31 100644 --- a/src/modules/rlm_mruby/rlm_mruby.c +++ b/src/modules/rlm_mruby/rlm_mruby.c @@ -472,7 +472,7 @@ DIAG_ON(DIAG_UNKNOWN_PRAGMAS) { \ return do_mruby(p_result, \ request, \ - (rlm_mruby_t const *)mctx->instance, \ + (rlm_mruby_t const *)mctx->inst->data, \ #foo); \ } diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c index 65b7b0b543..26995b0b38 100644 --- a/src/modules/rlm_mschap/rlm_mschap.c +++ b/src/modules/rlm_mschap/rlm_mschap.c @@ -1442,7 +1442,7 @@ static void mppe_chap2_gen_keys128(uint8_t const *nt_hashhash, uint8_t const *re */ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_mschap_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_mschap_t); + rlm_mschap_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_mschap_t); fr_pair_t *challenge = NULL; challenge = fr_pair_find_by_da_idx(&request->request_pairs, attr_ms_chap_challenge, 0); @@ -2000,7 +2000,7 @@ static unlang_action_t CC_HINT(nonnull(1,2,3,4,5,8,9)) mschap_process_v2_respons */ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_mschap_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_mschap_t); + rlm_mschap_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_mschap_t); fr_pair_t *challenge = NULL; fr_pair_t *response = NULL; fr_pair_t *cpw = NULL; @@ -2063,7 +2063,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, * input attribute, and we're calling out to an * external password store. */ - if (nt_password_find(&ephemeral, &nt_password, mctx->instance, request) < 0) RETURN_MODULE_FAIL; + if (nt_password_find(&ephemeral, &nt_password, mctx->inst->data, request) < 0) RETURN_MODULE_FAIL; /* * Check to see if this is a change password request, and process @@ -2073,7 +2073,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, if (cpw) { uint8_t *p; - mschap_process_cpw_request(&rcode, mctx->instance, request, cpw, nt_password); + mschap_process_cpw_request(&rcode, mctx->inst->data, request, cpw, nt_password); if (rcode != RLM_MODULE_OK) goto finish; /* diff --git a/src/modules/rlm_opendirectory/rlm_opendirectory.c b/src/modules/rlm_opendirectory/rlm_opendirectory.c index 54fe6b7c10..a27f920f6b 100644 --- a/src/modules/rlm_opendirectory/rlm_opendirectory.c +++ b/src/modules/rlm_opendirectory/rlm_opendirectory.c @@ -385,7 +385,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, */ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_opendirectory_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_opendirectory_t); + rlm_opendirectory_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_opendirectory_t); struct passwd *userdata = NULL; int ismember = 0; RADCLIENT *client = NULL; diff --git a/src/modules/rlm_pam/rlm_pam.c b/src/modules/rlm_pam/rlm_pam.c index 3b937bf7a8..e38577fdf4 100644 --- a/src/modules/rlm_pam/rlm_pam.c +++ b/src/modules/rlm_pam/rlm_pam.c @@ -213,7 +213,7 @@ static int do_pam(request_t *request, char const *username, char const *passwd, static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_pam_t const *data = talloc_get_type_abort_const(mctx->instance, rlm_pam_t); + rlm_pam_t const *data = talloc_get_type_abort_const(mctx->inst->data, rlm_pam_t); int ret; fr_pair_t *pair; diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c index d6de7c02f2..403e2e275e 100644 --- a/src/modules/rlm_pap/rlm_pap.c +++ b/src/modules/rlm_pap/rlm_pap.c @@ -137,7 +137,7 @@ static fr_dict_attr_t const **pap_alloweds; */ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_pap_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_pap_t); + rlm_pap_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_pap_t); fr_pair_t *password; if (fr_pair_find_by_da_idx(&request->control_pairs, attr_auth_type, 0) != NULL) { @@ -920,7 +920,7 @@ static const pap_auth_func_t auth_func_table[] = { */ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_pap_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_pap_t); + rlm_pap_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_pap_t); fr_pair_t *known_good; fr_pair_t *password; rlm_rcode_t rcode = RLM_MODULE_INVALID; diff --git a/src/modules/rlm_passwd/rlm_passwd.c b/src/modules/rlm_passwd/rlm_passwd.c index 258ddfd0cb..c3cf63ee49 100644 --- a/src/modules/rlm_passwd/rlm_passwd.c +++ b/src/modules/rlm_passwd/rlm_passwd.c @@ -535,7 +535,7 @@ static void result_add(TALLOC_CTX *ctx, rlm_passwd_t const *inst, request_t *req static unlang_action_t CC_HINT(nonnull) mod_passwd_map(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_passwd_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_passwd_t); + rlm_passwd_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_passwd_t); char buffer[1024]; fr_pair_t *key, *i; diff --git a/src/modules/rlm_perl/rlm_perl.c b/src/modules/rlm_perl/rlm_perl.c index d445858ee8..a4a372ec84 100644 --- a/src/modules/rlm_perl/rlm_perl.c +++ b/src/modules/rlm_perl/rlm_perl.c @@ -957,7 +957,7 @@ static unlang_action_t do_perl(rlm_rcode_t *p_result, void *instance, request_t #define RLM_PERL_FUNC(_x) \ static unlang_action_t CC_HINT(nonnull) mod_##_x(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) \ { \ - rlm_perl_t *inst = talloc_get_type_abort(mctx->instance, rlm_perl_t); \ + rlm_perl_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_perl_t); \ return do_perl(p_result, inst, request, \ ((rlm_perl_thread_t *)talloc_get_type_abort(mctx->thread, rlm_perl_thread_t))->perl, \ inst->func_##_x); \ @@ -973,7 +973,7 @@ RLM_PERL_FUNC(preacct) */ static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_perl_t *inst = talloc_get_type_abort(mctx->instance, rlm_perl_t); + rlm_perl_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_perl_t); fr_pair_t *pair; int acct_status_type = 0; char const *func; diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c index 9228b81691..9e5de17e36 100644 --- a/src/modules/rlm_python/rlm_python.c +++ b/src/modules/rlm_python/rlm_python.c @@ -618,7 +618,7 @@ static unlang_action_t do_python(rlm_rcode_t *p_result, rlm_python_t const *inst #define MOD_FUNC(x) \ static unlang_action_t CC_HINT(nonnull) mod_##x(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) \ { \ - rlm_python_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_python_t); \ + rlm_python_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_python_t); \ rlm_python_thread_t *thread = talloc_get_type_abort(mctx->thread, rlm_python_thread_t); \ return do_python(p_result, inst, thread, request, inst->x.function, #x);\ } diff --git a/src/modules/rlm_radius/rlm_radius.c b/src/modules/rlm_radius/rlm_radius.c index 5c19532be1..d3b72ac861 100644 --- a/src/modules/rlm_radius/rlm_radius.c +++ b/src/modules/rlm_radius/rlm_radius.c @@ -365,7 +365,7 @@ static int status_check_update_parse(TALLOC_CTX *ctx, void *out, UNUSED void *pa static void mod_radius_signal(module_ctx_t const *mctx, request_t *request, fr_state_signal_t action) { - rlm_radius_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_radius_t); + rlm_radius_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_radius_t); rlm_radius_thread_t *t = talloc_get_type_abort(mctx->thread, rlm_radius_thread_t); /* @@ -378,7 +378,7 @@ static void mod_radius_signal(module_ctx_t const *mctx, request_t *request, fr_s if (!inst->io->signal) return; inst->io->signal(&(module_ctx_t){ - .instance = inst->io_instance, + .inst = inst->io_submodule, .thread = t->io_thread, .rctx = mctx->rctx }, request, action); @@ -390,12 +390,12 @@ static void mod_radius_signal(module_ctx_t const *mctx, request_t *request, fr_s */ static unlang_action_t mod_radius_resume(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_radius_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_radius_t); + rlm_radius_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_radius_t); rlm_radius_thread_t *t = talloc_get_type_abort(mctx->thread, rlm_radius_thread_t); return inst->io->resume(p_result, &(module_ctx_t){ - .instance = inst->io_instance, + .inst = inst->io_submodule, .thread = t->io_thread, .rctx = mctx->rctx }, request); @@ -441,7 +441,7 @@ static void radius_fixups(rlm_radius_t const *inst, request_t *request) */ static unlang_action_t CC_HINT(nonnull) mod_process(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_radius_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_radius_t); + rlm_radius_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_radius_t); rlm_radius_thread_t *t = talloc_get_type_abort(mctx->thread, rlm_radius_thread_t); rlm_rcode_t rcode; unlang_action_t ua; diff --git a/src/modules/rlm_radutmp/rlm_radutmp.c b/src/modules/rlm_radutmp/rlm_radutmp.c index 4d9ded1000..f85ccbb988 100644 --- a/src/modules/rlm_radutmp/rlm_radutmp.c +++ b/src/modules/rlm_radutmp/rlm_radutmp.c @@ -178,7 +178,7 @@ static NAS_PORT *nas_port_find(NAS_PORT *nas_port_list, uint32_t nasaddr, uint16 */ static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_radutmp_t *inst = talloc_get_type_abort(mctx->instance, rlm_radutmp_t); + rlm_radutmp_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_radutmp_t); rlm_rcode_t rcode = RLM_MODULE_OK; struct radutmp ut, u; fr_pair_t *vp; diff --git a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c index 10d4f5b4d4..cca236f463 100644 --- a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c +++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c @@ -1264,7 +1264,7 @@ static unlang_action_t mod_action(rlm_rcode_t *p_result, rlm_redis_ippool_t cons static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_redis_ippool_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_redis_ippool_t); + rlm_redis_ippool_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_redis_ippool_t); fr_pair_t *vp; /* @@ -1300,7 +1300,7 @@ static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, mo static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_redis_ippool_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_redis_ippool_t); + rlm_redis_ippool_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_redis_ippool_t); fr_pair_t *vp; /* @@ -1313,7 +1313,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod static unlang_action_t CC_HINT(nonnull) mod_post_auth(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_redis_ippool_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_redis_ippool_t); + rlm_redis_ippool_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_redis_ippool_t); fr_pair_t *vp; ippool_action_t action = POOL_ACTION_ALLOCATE; @@ -1344,7 +1344,7 @@ run: static unlang_action_t CC_HINT(nonnull) mod_request(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_redis_ippool_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_redis_ippool_t); + rlm_redis_ippool_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_redis_ippool_t); fr_pair_t *vp; /* @@ -1358,7 +1358,7 @@ static unlang_action_t CC_HINT(nonnull) mod_request(rlm_rcode_t *p_result, modul static unlang_action_t CC_HINT(nonnull) mod_release(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_redis_ippool_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_redis_ippool_t); + rlm_redis_ippool_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_redis_ippool_t); fr_pair_t *vp; /* diff --git a/src/modules/rlm_rediswho/rlm_rediswho.c b/src/modules/rlm_rediswho/rlm_rediswho.c index a21cee9bcd..ff59ccc29e 100644 --- a/src/modules/rlm_rediswho/rlm_rediswho.c +++ b/src/modules/rlm_rediswho/rlm_rediswho.c @@ -198,7 +198,7 @@ static unlang_action_t mod_accounting_all(rlm_rcode_t *p_result, rlm_rediswho_t static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_rediswho_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_rediswho_t); + rlm_rediswho_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_rediswho_t); rlm_rcode_t rcode; fr_pair_t *vp; fr_dict_enum_value_t *dv; diff --git a/src/modules/rlm_rest/io.c b/src/modules/rlm_rest/io.c index 72e203de40..50dd20a0c3 100644 --- a/src/modules/rlm_rest/io.c +++ b/src/modules/rlm_rest/io.c @@ -47,7 +47,7 @@ void rest_io_module_action(module_ctx_t const *mctx, request_t *request, fr_stat } t->mhandle->transfers--; - rest_request_cleanup(mctx->instance, randle); + rest_request_cleanup(mctx->inst->data, randle); fr_pool_connection_release(t->pool, request, randle); } @@ -65,5 +65,5 @@ void rest_io_xlat_signal(request_t *request, UNUSED void *instance, void *thread rlm_rest_xlat_rctx_t *our_rctx = talloc_get_type_abort(rctx, rlm_rest_xlat_rctx_t); fr_curl_io_request_t *randle = talloc_get_type_abort(our_rctx->handle, fr_curl_io_request_t); - rest_io_module_action(&(module_ctx_t){ .instance = mod_inst, .thread = t, .rctx = randle }, request, action); + rest_io_module_action(&(module_ctx_t){ .inst = dl_module_instance_by_data(mod_inst), .thread = t, .rctx = randle }, request, action); } diff --git a/src/modules/rlm_rest/rlm_rest.c b/src/modules/rlm_rest/rlm_rest.c index 466f73bc5e..2337c87c7b 100644 --- a/src/modules/rlm_rest/rlm_rest.c +++ b/src/modules/rlm_rest/rlm_rest.c @@ -520,7 +520,7 @@ static xlat_action_t rest_xlat(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out, static unlang_action_t mod_authorize_result(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_rest_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_rest_t); + rlm_rest_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_rest_t); rlm_rest_thread_t *t = talloc_get_type_abort(mctx->thread, rlm_rest_thread_t); rlm_rest_section_t const *section = &inst->authenticate; fr_curl_io_request_t *handle = talloc_get_type_abort(mctx->rctx, fr_curl_io_request_t); @@ -609,7 +609,7 @@ finish: */ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_rest_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_rest_t); + rlm_rest_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_rest_t); rlm_rest_thread_t *t = talloc_get_type_abort(mctx->thread, rlm_rest_thread_t); rlm_rest_section_t const *section = &inst->authorize; @@ -635,7 +635,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod static unlang_action_t mod_authenticate_result(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_rest_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_rest_t); + rlm_rest_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_rest_t); rlm_rest_thread_t *t = talloc_get_type_abort(mctx->thread, rlm_rest_thread_t); rlm_rest_section_t const *section = &inst->authenticate; fr_curl_io_request_t *handle = talloc_get_type_abort(mctx->rctx, fr_curl_io_request_t); @@ -721,7 +721,7 @@ finish: */ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_rest_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_rest_t); + rlm_rest_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_rest_t); rlm_rest_thread_t *t = talloc_get_type_abort(mctx->thread, rlm_rest_thread_t); rlm_rest_section_t const *section = &inst->authenticate; fr_curl_io_request_t *handle; @@ -784,7 +784,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, static unlang_action_t mod_accounting_result(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_rest_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_rest_t); + rlm_rest_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_rest_t); rlm_rest_thread_t *t = talloc_get_type_abort(mctx->thread, rlm_rest_thread_t); rlm_rest_section_t const *section = &inst->authenticate; fr_curl_io_request_t *handle = talloc_get_type_abort(mctx->rctx, fr_curl_io_request_t); @@ -838,7 +838,7 @@ finish: */ static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_rest_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_rest_t); + rlm_rest_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_rest_t); rlm_rest_thread_t *t = talloc_get_type_abort(mctx->thread, rlm_rest_thread_t); rlm_rest_section_t const *section = &inst->accounting; @@ -863,7 +863,7 @@ static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, mo static unlang_action_t mod_post_auth_result(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_rest_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_rest_t); + rlm_rest_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_rest_t); rlm_rest_thread_t *t = talloc_get_type_abort(mctx->thread, rlm_rest_thread_t); rlm_rest_section_t const *section = &inst->authenticate; fr_curl_io_request_t *handle = talloc_get_type_abort(mctx->rctx, fr_curl_io_request_t); @@ -917,7 +917,7 @@ finish: */ static unlang_action_t CC_HINT(nonnull) mod_post_auth(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_rest_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_rest_t); + rlm_rest_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_rest_t); rlm_rest_thread_t *t = talloc_get_type_abort(mctx->thread, rlm_rest_thread_t); rlm_rest_section_t const *section = &inst->post_auth; diff --git a/src/modules/rlm_securid/rlm_securid.c b/src/modules/rlm_securid/rlm_securid.c index 3b9de07d14..083f4dd710 100644 --- a/src/modules/rlm_securid/rlm_securid.c +++ b/src/modules/rlm_securid/rlm_securid.c @@ -468,7 +468,7 @@ static int mod_instantiate(void *instance, UNUSED CONF_SECTION *conf) static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { int rcode; - rlm_securid_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_securid_t); + rlm_securid_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_securid_t); char buffer[FR_MAX_STRING_LEN]=""; fr_pair_t *username, *password; fr_pair_t *vp; diff --git a/src/modules/rlm_sigtran/rlm_sigtran.c b/src/modules/rlm_sigtran/rlm_sigtran.c index b6857aaa6c..e245b521e9 100644 --- a/src/modules/rlm_sigtran/rlm_sigtran.c +++ b/src/modules/rlm_sigtran/rlm_sigtran.c @@ -199,7 +199,7 @@ fr_dict_attr_autoload_t rlm_sigtran_dict_attr[] = { static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_sigtran_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_sigtran_t); + rlm_sigtran_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_sigtran_t); rlm_sigtran_thread_t const *t = talloc_get_type_abort_const(mctx->thread, rlm_sigtran_thread_t); return sigtran_client_map_send_auth_info(p_result, inst, request, inst->conn, t->fd); diff --git a/src/modules/rlm_smtp/rlm_smtp.c b/src/modules/rlm_smtp/rlm_smtp.c index cfec041192..05ca280353 100644 --- a/src/modules/rlm_smtp/rlm_smtp.c +++ b/src/modules/rlm_smtp/rlm_smtp.c @@ -692,7 +692,7 @@ static int _free_mail_ctx(fr_mail_ctx_t *uctx) static unlang_action_t mod_authorize_result(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { fr_mail_ctx_t *mail_ctx = talloc_get_type_abort(mctx->rctx, fr_mail_ctx_t); - rlm_smtp_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_smtp_t); + rlm_smtp_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_smtp_t); fr_curl_io_request_t *randle = mail_ctx->randle; fr_curl_tls_t const *tls; long curl_out; @@ -733,7 +733,7 @@ static unlang_action_t mod_authorize_result(rlm_rcode_t *p_result, module_ctx_t */ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_smtp_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_smtp_t); + rlm_smtp_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_smtp_t); rlm_smtp_thread_t *t = talloc_get_type_abort(mctx->thread, rlm_smtp_thread_t); fr_curl_io_request_t *randle; fr_mail_ctx_t *mail_ctx; @@ -859,7 +859,7 @@ error: */ static unlang_action_t CC_HINT(nonnull) mod_authenticate_resume(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_smtp_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_smtp_t); + rlm_smtp_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_smtp_t); fr_curl_io_request_t *randle = talloc_get_type_abort(mctx->rctx, fr_curl_io_request_t); fr_curl_tls_t const *tls; long curl_out; @@ -898,7 +898,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate_resume(rlm_rcode_t *p_r */ static unlang_action_t CC_HINT(nonnull(1,2)) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_smtp_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_smtp_t); + rlm_smtp_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_smtp_t); rlm_smtp_thread_t *t = talloc_get_type_abort(mctx->thread, rlm_smtp_thread_t); fr_pair_t const *username, *password; fr_curl_io_request_t *randle; diff --git a/src/modules/rlm_soh/rlm_soh.c b/src/modules/rlm_soh/rlm_soh.c index 86b708855c..4d2f08e05e 100644 --- a/src/modules/rlm_soh/rlm_soh.c +++ b/src/modules/rlm_soh/rlm_soh.c @@ -188,7 +188,7 @@ static unlang_action_t CC_HINT(nonnull) mod_post_auth(rlm_rcode_t *p_result, mod { int rcode; fr_pair_t *vp; - rlm_soh_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_soh_t); + rlm_soh_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_soh_t); if (!inst->dhcp) RETURN_MODULE_NOOP; diff --git a/src/modules/rlm_sometimes/rlm_sometimes.c b/src/modules/rlm_sometimes/rlm_sometimes.c index 893aa51c1c..81e8b37c01 100644 --- a/src/modules/rlm_sometimes/rlm_sometimes.c +++ b/src/modules/rlm_sometimes/rlm_sometimes.c @@ -144,12 +144,12 @@ static unlang_action_t sometimes_return(rlm_rcode_t *p_result, void const *insta static unlang_action_t CC_HINT(nonnull) mod_sometimes_packet(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - return sometimes_return(p_result, mctx->instance, request, request->packet, request->reply); + return sometimes_return(p_result, mctx->inst->data, request, request->packet, request->reply); } static unlang_action_t CC_HINT(nonnull) mod_sometimes_reply(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - return sometimes_return(p_result, mctx->instance, request, request->reply, NULL); + return sometimes_return(p_result, mctx->inst->data, request, request->reply, NULL); } extern module_t rlm_sometimes; diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c index af13c33d24..4c6bbb9ac1 100644 --- a/src/modules/rlm_sql/rlm_sql.c +++ b/src/modules/rlm_sql/rlm_sql.c @@ -1234,7 +1234,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod { rlm_rcode_t rcode = RLM_MODULE_NOOP; - rlm_sql_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_sql_t); + rlm_sql_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_sql_t); rlm_sql_handle_t *handle; fr_pair_list_t check_tmp; @@ -1648,7 +1648,7 @@ finish: */ static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_sql_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_sql_t); + rlm_sql_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_sql_t); if (inst->config.accounting.reference_cp) { return acct_redundant(p_result, inst, request, &inst->config.accounting); @@ -1662,7 +1662,7 @@ static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, mo */ static unlang_action_t CC_HINT(nonnull) mod_post_auth(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_sql_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_sql_t); + rlm_sql_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_sql_t); if (inst->config.postauth.reference_cp) { return acct_redundant(p_result, inst, request, &inst->config.postauth); diff --git a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c index a6adfbc9b4..eb94ea2e40 100644 --- a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c +++ b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c @@ -375,7 +375,7 @@ static int counter_cmp(void *instance, request_t *request, UNUSED fr_pair_list_t */ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_sqlcounter_t *inst = talloc_get_type_abort(mctx->instance, rlm_sqlcounter_t); + rlm_sqlcounter_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_sqlcounter_t); uint64_t counter, res; fr_pair_t *limit; fr_pair_t *reply_item; diff --git a/src/modules/rlm_sqlippool/rlm_sqlippool.c b/src/modules/rlm_sqlippool/rlm_sqlippool.c index 36536afae6..11c4813b86 100644 --- a/src/modules/rlm_sqlippool/rlm_sqlippool.c +++ b/src/modules/rlm_sqlippool/rlm_sqlippool.c @@ -505,7 +505,7 @@ static unlang_action_t do_logging(rlm_rcode_t *p_result, UNUSED rlm_sqlippool_t */ static unlang_action_t CC_HINT(nonnull) mod_alloc(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_sqlippool_t *inst = talloc_get_type_abort(mctx->instance, rlm_sqlippool_t); + rlm_sqlippool_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_sqlippool_t); char allocation[FR_MAX_STRING_LEN]; int allocation_len; fr_pair_t *vp; @@ -673,7 +673,7 @@ static unlang_action_t CC_HINT(nonnull) mod_alloc(rlm_rcode_t *p_result, module_ */ static unlang_action_t CC_HINT(nonnull) mod_update(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_sqlippool_t *inst = talloc_get_type_abort(mctx->instance, rlm_sqlippool_t); + rlm_sqlippool_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_sqlippool_t); rlm_sql_handle_t *handle; int affected; @@ -726,7 +726,7 @@ static unlang_action_t CC_HINT(nonnull) mod_update(rlm_rcode_t *p_result, module */ static unlang_action_t CC_HINT(nonnull) mod_release(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_sqlippool_t *inst = talloc_get_type_abort(mctx->instance, rlm_sqlippool_t); + rlm_sqlippool_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_sqlippool_t); rlm_sql_handle_t *handle; handle = fr_pool_connection_get(inst->sql_inst->pool, request); @@ -756,7 +756,7 @@ static unlang_action_t CC_HINT(nonnull) mod_release(rlm_rcode_t *p_result, modul */ static unlang_action_t CC_HINT(nonnull) mod_bulk_release(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_sqlippool_t *inst = talloc_get_type_abort(mctx->instance, rlm_sqlippool_t); + rlm_sqlippool_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_sqlippool_t); rlm_sql_handle_t *handle; handle = fr_pool_connection_get(inst->sql_inst->pool, request); @@ -787,7 +787,7 @@ static unlang_action_t CC_HINT(nonnull) mod_bulk_release(rlm_rcode_t *p_result, */ static unlang_action_t CC_HINT(nonnull) mod_mark(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_sqlippool_t *inst = talloc_get_type_abort(mctx->instance, rlm_sqlippool_t); + rlm_sqlippool_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_sqlippool_t); rlm_sql_handle_t *handle; handle = fr_pool_connection_get(inst->sql_inst->pool, request); diff --git a/src/modules/rlm_stats/rlm_stats.c b/src/modules/rlm_stats/rlm_stats.c index a7c406060f..93cb22ed69 100644 --- a/src/modules/rlm_stats/rlm_stats.c +++ b/src/modules/rlm_stats/rlm_stats.c @@ -160,7 +160,7 @@ static void coalesce(uint64_t final_stats[FR_RADIUS_CODE_MAX], rlm_stats_thread_ */ static unlang_action_t CC_HINT(nonnull) mod_stats(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_stats_t *inst = talloc_get_type_abort(mctx->instance, rlm_stats_t); + rlm_stats_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_stats_t); rlm_stats_thread_t *t = talloc_get_type_abort(mctx->thread, rlm_stats_thread_t); int i; uint32_t stats_type; diff --git a/src/modules/rlm_unix/rlm_unix.c b/src/modules/rlm_unix/rlm_unix.c index 337b95ec06..a963aeaeae 100644 --- a/src/modules/rlm_unix/rlm_unix.c +++ b/src/modules/rlm_unix/rlm_unix.c @@ -338,7 +338,7 @@ static char *uue(void *in) */ static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_unix_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_unix_t); + rlm_unix_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_unix_t); fr_pair_t *vp; FILE *fp; struct utmp ut; diff --git a/src/modules/rlm_wimax/rlm_wimax.c b/src/modules/rlm_wimax/rlm_wimax.c index 1119968247..013c3ad9e7 100644 --- a/src/modules/rlm_wimax/rlm_wimax.c +++ b/src/modules/rlm_wimax/rlm_wimax.c @@ -162,7 +162,7 @@ static unlang_action_t CC_HINT(nonnull) mod_preacct(rlm_rcode_t *p_result, modul */ static unlang_action_t CC_HINT(nonnull) mod_post_auth(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_wimax_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_wimax_t); + rlm_wimax_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_wimax_t); fr_pair_t *msk, *emsk, *vp; fr_pair_t *mn_nai, *ip, *fa_rk; EVP_MD_CTX *hmac_ctx; diff --git a/src/modules/rlm_winbind/rlm_winbind.c b/src/modules/rlm_winbind/rlm_winbind.c index f95b42fe9c..14dd21f078 100644 --- a/src/modules/rlm_winbind/rlm_winbind.c +++ b/src/modules/rlm_winbind/rlm_winbind.c @@ -468,7 +468,7 @@ static int mod_detach(void *instance) */ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_winbind_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_winbind_t); + rlm_winbind_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_winbind_t); fr_pair_t *vp; vp = fr_pair_find_by_da_idx(&request->request_pairs, attr_user_password, 0); @@ -497,7 +497,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod */ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_winbind_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_winbind_t); + rlm_winbind_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_winbind_t); fr_pair_t *username, *password; username = fr_pair_find_by_da_idx(&request->request_pairs, attr_user_name, 0); diff --git a/src/modules/rlm_yubikey/rlm_yubikey.c b/src/modules/rlm_yubikey/rlm_yubikey.c index 39e51e795a..fdb381e843 100644 --- a/src/modules/rlm_yubikey/rlm_yubikey.c +++ b/src/modules/rlm_yubikey/rlm_yubikey.c @@ -274,7 +274,7 @@ static int CC_HINT(nonnull) otp_string_valid(rlm_yubikey_t const *inst, char con */ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_yubikey_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_yubikey_t); + rlm_yubikey_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_yubikey_t); char const *passcode; size_t len; fr_pair_t *vp, *password; @@ -385,7 +385,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod */ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) { - rlm_yubikey_t const *inst = talloc_get_type_abort_const(mctx->instance, rlm_yubikey_t); + rlm_yubikey_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_yubikey_t); rlm_rcode_t rcode = RLM_MODULE_NOOP; char const *passcode = NULL; fr_pair_t const *vp; diff --git a/src/process/arp/base.c b/src/process/arp/base.c index 71b5f389a5..49782421ec 100644 --- a/src/process/arp/base.c +++ b/src/process/arp/base.c @@ -182,7 +182,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc PROCESS_TRACE; - (void)talloc_get_type_abort_const(mctx->instance, process_arp_t); + (void)talloc_get_type_abort_const(mctx->inst->data, process_arp_t); fr_assert(PROCESS_PACKET_CODE_VALID(request->packet->code)); request->component = "arp"; diff --git a/src/process/dhcpv4/base.c b/src/process/dhcpv4/base.c index 3b791063e6..56692448f2 100644 --- a/src/process/dhcpv4/base.c +++ b/src/process/dhcpv4/base.c @@ -310,7 +310,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc PROCESS_TRACE; - (void)talloc_get_type_abort_const(mctx->instance, process_dhcpv4_t); + (void)talloc_get_type_abort_const(mctx->inst->data, process_dhcpv4_t); fr_assert(PROCESS_PACKET_CODE_VALID(request->packet->code)); request->component = "dhcpv4"; diff --git a/src/process/dhcpv6/base.c b/src/process/dhcpv6/base.c index f1f6d8c5c7..15a5140143 100644 --- a/src/process/dhcpv6/base.c +++ b/src/process/dhcpv6/base.c @@ -400,7 +400,7 @@ RECV(for_any_server) { CONF_SECTION *cs; fr_process_state_t const *state; - process_dhcpv6_t const *inst = mctx->instance; + process_dhcpv6_t const *inst = mctx->inst->data; process_dhcpv6_client_fields_t *rctx = NULL; PROCESS_TRACE; @@ -435,7 +435,7 @@ RECV(for_this_server) { CONF_SECTION *cs; fr_process_state_t const *state; - process_dhcpv6_t const *inst = mctx->instance; + process_dhcpv6_t const *inst = mctx->inst->data; process_dhcpv6_client_fields_t *rctx; PROCESS_TRACE; @@ -579,7 +579,7 @@ void status_code_add(process_dhcpv6_t const *inst, request_t *request, fr_value_ */ RESUME(send_to_client) { - process_dhcpv6_t *inst = talloc_get_type_abort(mctx->instance, process_dhcpv6_t); + process_dhcpv6_t *inst = talloc_get_type_abort(mctx->inst->data, process_dhcpv6_t); process_dhcpv6_client_fields_t *fields = talloc_get_type_abort(mctx->rctx, process_dhcpv6_client_fields_t); fr_process_state_t const *state; @@ -663,7 +663,7 @@ RECV(from_relay) { CONF_SECTION *cs; fr_process_state_t const *state; - process_dhcpv6_t const *inst = mctx->instance; + process_dhcpv6_t const *inst = mctx->inst->data; process_dhcpv6_relay_fields_t *rctx = NULL; rctx = dhcpv6_relay_fields_store(request); @@ -681,7 +681,7 @@ RECV(from_relay) */ RESUME(send_to_relay) { - process_dhcpv6_t *inst = talloc_get_type_abort(mctx->instance, process_dhcpv6_t); + process_dhcpv6_t *inst = talloc_get_type_abort(mctx->inst->data, process_dhcpv6_t); process_dhcpv6_relay_fields_t *fields = talloc_get_type_abort(mctx->rctx, process_dhcpv6_relay_fields_t); fr_process_state_t const *state; @@ -718,7 +718,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc PROCESS_TRACE; - (void)talloc_get_type_abort_const(mctx->instance, process_dhcpv6_t); + (void)talloc_get_type_abort_const(mctx->inst->data, process_dhcpv6_t); fr_assert(PROCESS_PACKET_CODE_VALID(request->packet->code)); request->component = "dhcpv6"; diff --git a/src/process/dns/base.c b/src/process/dns/base.c index 298dfdcefd..c8f8d14406 100644 --- a/src/process/dns/base.c +++ b/src/process/dns/base.c @@ -149,7 +149,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc PROCESS_TRACE; - (void)talloc_get_type_abort_const(mctx->instance, process_dns_t); + (void)talloc_get_type_abort_const(mctx->inst->data, process_dns_t); fr_assert(PROCESS_PACKET_CODE_VALID(request->packet->code)); request->component = "dns"; diff --git a/src/process/radius/base.c b/src/process/radius/base.c index 6e8bc3d85e..cc4fc62926 100644 --- a/src/process/radius/base.c +++ b/src/process/radius/base.c @@ -356,7 +356,7 @@ static void CC_HINT(format (printf, 4, 5)) auth_message(process_radius_auth_t co RECV(access_request) { - process_radius_t const *inst = talloc_get_type_abort_const(mctx->instance, process_radius_t); + process_radius_t const *inst = talloc_get_type_abort_const(mctx->inst->data, process_radius_t); /* * Only reject if the state has already been thawed. @@ -379,7 +379,7 @@ RESUME(access_request) CONF_SECTION *cs; fr_dict_enum_value_t const *dv; fr_process_state_t const *state; - process_radius_t const *inst = talloc_get_type_abort_const(mctx->instance, process_radius_t); + process_radius_t const *inst = talloc_get_type_abort_const(mctx->inst->data, process_radius_t); PROCESS_TRACE; @@ -545,7 +545,7 @@ RESUME(auth_type) RESUME_NO_RCTX(access_accept) { fr_pair_t *vp; - process_radius_t const *inst = talloc_get_type_abort_const(mctx->instance, process_radius_t); + process_radius_t const *inst = talloc_get_type_abort_const(mctx->inst->data, process_radius_t); PROCESS_TRACE; @@ -578,7 +578,7 @@ RESUME_NO_RCTX(access_accept) RESUME_NO_RCTX(access_reject) { fr_pair_t *vp; - process_radius_t const *inst = talloc_get_type_abort_const(mctx->instance, process_radius_t); + process_radius_t const *inst = talloc_get_type_abort_const(mctx->inst->data, process_radius_t); PROCESS_TRACE; @@ -595,7 +595,7 @@ RESUME_NO_RCTX(access_reject) RESUME(access_challenge) { - process_radius_t const *inst = talloc_get_type_abort_const(mctx->instance, process_radius_t); + process_radius_t const *inst = talloc_get_type_abort_const(mctx->inst->data, process_radius_t); PROCESS_TRACE; @@ -657,7 +657,7 @@ RESUME(accounting_request) CONF_SECTION *cs; fr_dict_enum_value_t const *dv; fr_process_state_t const *state; - process_radius_t const *inst = talloc_get_type_abort_const(mctx->instance, process_radius_t); + process_radius_t const *inst = talloc_get_type_abort_const(mctx->inst->data, process_radius_t); PROCESS_TRACE; @@ -758,7 +758,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc { fr_process_state_t const *state; - (void) talloc_get_type_abort_const(mctx->instance, process_radius_t); + (void) talloc_get_type_abort_const(mctx->inst->data, process_radius_t); PROCESS_TRACE; diff --git a/src/process/tacacs/base.c b/src/process/tacacs/base.c index 8ef6d1dba4..9942c40fa8 100644 --- a/src/process/tacacs/base.c +++ b/src/process/tacacs/base.c @@ -183,7 +183,7 @@ RECV(tacacs) { CONF_SECTION *cs; fr_process_state_t const *state; - PROCESS_INST *inst = mctx->instance; + PROCESS_INST *inst = mctx->inst->data; fr_tacacs_packet_hdr_t const *pkt = (fr_tacacs_packet_hdr_t const *) request->packet->data; PROCESS_TRACE; @@ -215,7 +215,7 @@ RESUME(tacacs_type) { rlm_rcode_t rcode = *p_result; fr_process_state_t const *state; - PROCESS_INST *inst = mctx->instance; + PROCESS_INST *inst = mctx->inst->data; PROCESS_TRACE; @@ -253,7 +253,7 @@ RESUME(recv_tacacs) rlm_rcode_t rcode = *p_result; CONF_SECTION *cs; fr_process_state_t const *state; - PROCESS_INST *inst = mctx->instance; + PROCESS_INST *inst = mctx->inst->data; PROCESS_TRACE; @@ -324,7 +324,7 @@ RESUME(recv_tacacs) RESUME(send_tacacs) { - PROCESS_INST const *inst = mctx->instance; + PROCESS_INST const *inst = mctx->inst->data; PROCESS_TRACE; @@ -562,7 +562,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc PROCESS_TRACE; - (void)talloc_get_type_abort_const(mctx->instance, process_tacacs_t); + (void)talloc_get_type_abort_const(mctx->inst->data, process_tacacs_t); fr_assert(PROCESS_PACKET_CODE_VALID(request->packet->code)); request->component = "tacacs"; diff --git a/src/process/tls/base.c b/src/process/tls/base.c index 8b956990fd..e47774d57a 100644 --- a/src/process/tls/base.c +++ b/src/process/tls/base.c @@ -137,7 +137,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc PROCESS_TRACE; - (void)talloc_get_type_abort_const(mctx->instance, process_tls_t); + (void)talloc_get_type_abort_const(mctx->inst->data, process_tls_t); request->component = "tls"; request->module = NULL; diff --git a/src/process/ttls/base.c b/src/process/ttls/base.c index bf75b9aee5..2cc0f6465a 100644 --- a/src/process/ttls/base.c +++ b/src/process/ttls/base.c @@ -361,7 +361,7 @@ RESUME(access_request) CONF_SECTION *cs; fr_dict_enum_value_t const *dv; fr_process_state_t const *state; - process_ttls_t const *inst = talloc_get_type_abort_const(mctx->instance, process_ttls_t); + process_ttls_t const *inst = talloc_get_type_abort_const(mctx->inst->data, process_ttls_t); PROCESS_TRACE; @@ -527,7 +527,7 @@ RESUME(auth_type) RESUME_NO_RCTX(access_accept) { fr_pair_t *vp; - process_ttls_t const *inst = talloc_get_type_abort_const(mctx->instance, process_ttls_t); + process_ttls_t const *inst = talloc_get_type_abort_const(mctx->inst->data, process_ttls_t); PROCESS_TRACE; @@ -560,7 +560,7 @@ RESUME_NO_RCTX(access_accept) RESUME_NO_RCTX(access_reject) { fr_pair_t *vp; - process_ttls_t const *inst = talloc_get_type_abort_const(mctx->instance, process_ttls_t); + process_ttls_t const *inst = talloc_get_type_abort_const(mctx->inst->data, process_ttls_t); PROCESS_TRACE; @@ -579,7 +579,7 @@ RESUME(access_challenge) { CONF_SECTION *cs; fr_process_state_t const *state; - process_ttls_t const *inst = talloc_get_type_abort_const(mctx->instance, process_ttls_t); + process_ttls_t const *inst = talloc_get_type_abort_const(mctx->inst->data, process_ttls_t); PROCESS_TRACE; @@ -640,7 +640,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc { fr_process_state_t const *state; - (void) talloc_get_type_abort_const(mctx->instance, process_ttls_t); + (void) talloc_get_type_abort_const(mctx->inst->data, process_ttls_t); PROCESS_TRACE; diff --git a/src/process/vmps/base.c b/src/process/vmps/base.c index 4d981e0349..dc80e9396b 100644 --- a/src/process/vmps/base.c +++ b/src/process/vmps/base.c @@ -207,7 +207,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc PROCESS_TRACE; - (void)talloc_get_type_abort_const(mctx->instance, process_vmps_t); + (void)talloc_get_type_abort_const(mctx->inst->data, process_vmps_t); fr_assert(PROCESS_PACKET_CODE_VALID(request->packet->code)); request->component = "vmps";