From: Arran Cudbard-Bell Date: Sun, 1 Nov 2020 15:50:18 +0000 (-0600) Subject: More struct name fixes X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5198ca3cc24d19bdf4d451dc10609e4d3992defb;p=thirdparty%2Ffreeradius-server.git More struct name fixes --- diff --git a/src/lib/server/virtual_servers.c b/src/lib/server/virtual_servers.c index 63e7dd49769..ee7c97ed6b6 100644 --- a/src/lib/server/virtual_servers.c +++ b/src/lib/server/virtual_servers.c @@ -1097,8 +1097,8 @@ rlm_rcode_t process_authenticate(int auth_type, request_t *request) rlm_rcode_t virtual_server_process_auth(request_t *request, CONF_SECTION *virtual_server, rlm_rcode_t default_rcode, - fr_unlang_module_resume_t resume, - fr_unlang_module_signal_t signal, void *rctx) + unlang_module_resume_t resume, + unlang_module_signal_t signal, void *rctx) { fr_pair_t *vp; CONF_SECTION *auth_cs = NULL; diff --git a/src/lib/server/virtual_servers.h b/src/lib/server/virtual_servers.h index bc4db732007..0febb75b735 100644 --- a/src/lib/server/virtual_servers.h +++ b/src/lib/server/virtual_servers.h @@ -91,8 +91,8 @@ rlm_rcode_t process_authenticate(int type, request_t *request); rlm_rcode_t virtual_server_process_auth(request_t *request, CONF_SECTION *virtual_server, rlm_rcode_t default_rcode, - fr_unlang_module_resume_t resume, - fr_unlang_module_signal_t signal, void *rctx); + unlang_module_resume_t resume, + unlang_module_signal_t signal, void *rctx); void fr_request_async_bootstrap(request_t *request, fr_event_list_t *el); /* for unit_test_module */ diff --git a/src/lib/unlang/interpret.c b/src/lib/unlang/interpret.c index 266dad37246..ff8821da35b 100644 --- a/src/lib/unlang/interpret.c +++ b/src/lib/unlang/interpret.c @@ -1036,7 +1036,7 @@ void *unlang_interpret_stack_alloc(TALLOC_CTX *ctx) * This is typically called via an "async" action, i.e. an action * outside of the normal processing of the request. * - * If there is no #fr_unlang_module_signal_t callback defined, the action is ignored. + * If there is no #unlang_module_signal_t callback defined, the action is ignored. * * The signaling stops at the "limit" frame. This is so that keywords * such as "timeout" and "limit" can signal frames *lower* than theirs @@ -1088,7 +1088,7 @@ static void frame_signal(request_t *request, fr_state_signal_t action, int limit * This is typically called via an "async" action, i.e. an action * outside of the normal processing of the request. * - * If there is no #fr_unlang_module_signal_t callback defined, the action is ignored. + * If there is no #unlang_module_signal_t callback defined, the action is ignored. * * @param[in] request The current request. * @param[in] action to signal. diff --git a/src/lib/unlang/module.c b/src/lib/unlang/module.c index a1c944e333f..95aa79e45ca 100644 --- a/src/lib/unlang/module.c +++ b/src/lib/unlang/module.c @@ -44,10 +44,10 @@ RCSID("$Id$") typedef struct { request_t *request; //!< Request this event pertains to. int fd; //!< File descriptor to wait on. - fr_unlang_module_timeout_t timeout; //!< Function to call on timeout. - fr_unlang_module_fd_event_t fd_read; //!< Function to call when FD is readable. - fr_unlang_module_fd_event_t fd_write; //!< Function to call when FD is writable. - fr_unlang_module_fd_event_t fd_error; //!< Function to call when FD has errored. + unlang_module_timeout_t timeout; //!< Function to call on timeout. + unlang_module_fd_event_t fd_read; //!< Function to call when FD is readable. + unlang_module_fd_event_t fd_write; //!< Function to call when FD is writable. + unlang_module_fd_event_t fd_error; //!< Function to call when FD has errored. void const *inst; //!< Module instance to pass to callbacks. void *thread; //!< Thread specific module instance. void const *ctx; //!< ctx data to pass to callbacks. @@ -134,7 +134,7 @@ static void unlang_module_event_timeout_handler(UNUSED fr_event_list_t *el, fr_t * - 0 on success. * - <0 on error. */ -int unlang_module_timeout_add(request_t *request, fr_unlang_module_timeout_t callback, +int unlang_module_timeout_add(request_t *request, unlang_module_timeout_t callback, void const *ctx, fr_time_t when) { unlang_stack_t *stack = request->stack; @@ -261,9 +261,9 @@ static void unlang_event_fd_error_handler(UNUSED fr_event_list_t *el, int fd, * - <0 on error. */ int unlang_module_fd_add(request_t *request, - fr_unlang_module_fd_event_t read, - fr_unlang_module_fd_event_t write, - fr_unlang_module_fd_event_t error, + unlang_module_fd_event_t read, + unlang_module_fd_event_t write, + unlang_module_fd_event_t error, void const *ctx, int fd) { unlang_stack_t *stack = request->stack; @@ -416,8 +416,8 @@ request_t *unlang_module_subrequest_alloc(request_t *parent, fr_dict_t const *na * - RLM_MODULE_YIELD. */ rlm_rcode_t unlang_module_yield_to_subrequest(rlm_rcode_t *out, request_t *child, - fr_unlang_module_resume_t resume, - fr_unlang_module_signal_t signal, + unlang_module_resume_t resume, + unlang_module_signal_t signal, unlang_subrequest_session_t const *session, void *rctx) { @@ -462,8 +462,8 @@ rlm_rcode_t unlang_module_yield_to_subrequest(rlm_rcode_t *out, request_t *child */ rlm_rcode_t unlang_module_yield_to_xlat(TALLOC_CTX *ctx, fr_value_box_t **out, request_t *request, xlat_exp_t const *exp, - fr_unlang_module_resume_t resume, - fr_unlang_module_signal_t signal, void *rctx) + unlang_module_resume_t resume, + unlang_module_signal_t signal, void *rctx) { /* * Push the resumption point BEFORE pushing the xlat onto @@ -509,8 +509,8 @@ rlm_rcode_t unlang_module_yield_to_xlat(TALLOC_CTX *ctx, fr_value_box_t **out, rlm_rcode_t unlang_module_yield_to_tmpl(TALLOC_CTX *ctx, fr_value_box_t **out, int *status, request_t *request, tmpl_t const *vpt, fr_pair_t *vps, - fr_unlang_module_resume_t resume, - fr_unlang_module_signal_t signal, void *rctx) + unlang_module_resume_t resume, + unlang_module_signal_t signal, void *rctx) { /* * Push the resumption point BEFORE pushing the xlat onto @@ -528,8 +528,8 @@ rlm_rcode_t unlang_module_yield_to_tmpl(TALLOC_CTX *ctx, fr_value_box_t **out, i rlm_rcode_t unlang_module_yield_to_section(request_t *request, CONF_SECTION *subcs, rlm_rcode_t default_rcode, - fr_unlang_module_resume_t resume, - fr_unlang_module_signal_t signal, void *rctx) + unlang_module_resume_t resume, + unlang_module_signal_t signal, void *rctx) { if (!subcs) { unlang_stack_t *stack = request->stack; @@ -585,7 +585,7 @@ static inline void safe_unlock(module_instance_t *instance) * This is typically called via an "async" action, i.e. an action * outside of the normal processing of the request. * - * If there is no #fr_unlang_module_signal_t callback defined, the action is ignored. + * If there is no #unlang_module_signal_t callback defined, the action is ignored. * * @param[in] request The current request. * @param[in] action to signal. @@ -725,7 +725,7 @@ static unlang_action_t unlang_module_resume(request_t *request, rlm_rcode_t *pre * resume frame. */ rlm_rcode_t unlang_module_yield(request_t *request, - fr_unlang_module_resume_t resume, fr_unlang_module_signal_t signal, void *rctx) + unlang_module_resume_t resume, unlang_module_signal_t signal, void *rctx) { unlang_stack_t *stack = request->stack; unlang_stack_frame_t *frame = &stack->frame[stack->depth]; diff --git a/src/lib/unlang/module.h b/src/lib/unlang/module.h index 1ff437ff590..3e1ece9764f 100644 --- a/src/lib/unlang/module.h +++ b/src/lib/unlang/module.h @@ -48,7 +48,7 @@ extern "C" { * @param[in] request the request. * @param[in] fired the time the timeout event actually fired. */ -typedef void (*fr_unlang_module_timeout_t)(module_ctx_t const *mctx, request_t *request, void *rctx, fr_time_t fired); +typedef void (*unlang_module_timeout_t)(module_ctx_t const *mctx, request_t *request, void *rctx, fr_time_t fired); /** A callback when the FD is ready for reading * @@ -63,7 +63,7 @@ typedef void (*fr_unlang_module_timeout_t)(module_ctx_t const *mctx, request_t * * @param[in] rctx a local context for the callback. * @param[in] fd the file descriptor. */ -typedef void (*fr_unlang_module_fd_event_t)(module_ctx_t const *mctx, request_t *request, void *rctx, int fd); +typedef void (*unlang_module_fd_event_t)(module_ctx_t const *mctx, request_t *request, void *rctx, int fd); /** A callback for when the request is resumed. * @@ -75,7 +75,7 @@ typedef void (*fr_unlang_module_fd_event_t)(module_ctx_t const *mctx, request_t * @param[in] rctx a local context for the callback. * @return a normal rlm_rcode_t. */ -typedef rlm_rcode_t (*fr_unlang_module_resume_t)(module_ctx_t const *mctx, request_t *request, void *rctx); +typedef rlm_rcode_t (*unlang_module_resume_t)(module_ctx_t const *mctx, request_t *request, void *rctx); /** A callback when the request gets a fr_state_signal_t. * @@ -90,53 +90,52 @@ typedef rlm_rcode_t (*fr_unlang_module_resume_t)(module_ctx_t const *mctx, requ * @param[in] request The current request. * @param[in] action which is signalling the request. */ -typedef void (*fr_unlang_module_signal_t)(module_ctx_t const *mctx, request_t *request, - void *rctx, fr_state_signal_t action); +typedef void (*unlang_module_signal_t)(module_ctx_t const *mctx, request_t *request, + void *rctx, fr_state_signal_t action); -int unlang_module_timeout_add(request_t *request, fr_unlang_module_timeout_t callback, +int unlang_module_timeout_add(request_t *request, unlang_module_timeout_t callback, void const *ctx, fr_time_t when); int unlang_module_timeout_delete(request_t *request, void const *ctx); int unlang_module_fd_add(request_t *request, - fr_unlang_module_fd_event_t read, - fr_unlang_module_fd_event_t write, - fr_unlang_module_fd_event_t error, + unlang_module_fd_event_t read, + unlang_module_fd_event_t write, + unlang_module_fd_event_t error, void const *rctx, int fd); - int unlang_module_fd_delete(request_t *request, void const *rctx, int fd); void unlang_module_push(rlm_rcode_t *out, request_t *request, module_instance_t *module_instance, module_method_t method, bool top_frame); -request_t *unlang_module_subrequest_alloc(request_t *parent, fr_dict_t const *namespace); +request_t *unlang_module_subrequest_alloc(request_t *parent, fr_dict_t const *namespace); rlm_rcode_t unlang_module_yield_to_subrequest(rlm_rcode_t *out, request_t *child, - fr_unlang_module_resume_t resume, - fr_unlang_module_signal_t signal, + unlang_module_resume_t resume, + unlang_module_signal_t signal, unlang_subrequest_session_t const *session, void *rctx); rlm_rcode_t unlang_module_yield_to_section(request_t *request, CONF_SECTION *subcs, rlm_rcode_t default_rcode, - fr_unlang_module_resume_t resume, - fr_unlang_module_signal_t signal, void *rctx); + unlang_module_resume_t resume, + unlang_module_signal_t signal, void *rctx); rlm_rcode_t unlang_module_yield_to_xlat(TALLOC_CTX *ctx, fr_value_box_t **out, request_t *request, xlat_exp_t const *xlat, - fr_unlang_module_resume_t resume, - fr_unlang_module_signal_t signal, void *rctx); + unlang_module_resume_t resume, + unlang_module_signal_t signal, void *rctx); -rlm_rcode_t unlang_module_yield_to_tmpl(TALLOC_CTX *ctx, fr_value_box_t **out, int *status, - request_t *request, tmpl_t const *exp, - fr_pair_t *vps, - fr_unlang_module_resume_t resume, - fr_unlang_module_signal_t signal, void *rctx); +rlm_rcode_t unlang_module_yield_to_tmpl(TALLOC_CTX *ctx, fr_value_box_t **out, int *status, + request_t *request, tmpl_t const *exp, + fr_pair_t *vps, + unlang_module_resume_t resume, + unlang_module_signal_t signal, void *rctx); rlm_rcode_t unlang_module_yield(request_t *request, - fr_unlang_module_resume_t resume, - fr_unlang_module_signal_t signal, void *rctx); + unlang_module_resume_t resume, + unlang_module_signal_t signal, void *rctx); #ifdef __cplusplus } diff --git a/src/lib/unlang/module_priv.h b/src/lib/unlang/module_priv.h index 1bc74de2419..a1755bc0bab 100644 --- a/src/lib/unlang/module_priv.h +++ b/src/lib/unlang/module_priv.h @@ -47,8 +47,8 @@ typedef struct { rlm_rcode_t rcode; //!< the result, only for unlang_module_resume_final module_thread_instance_t *thread; //!< thread-local data for this module void *rctx; //!< for resume / signal - fr_unlang_module_resume_t resume; //!< resumption handler - fr_unlang_module_signal_t signal; //!< for signal handlers + unlang_module_resume_t resume; //!< resumption handler + unlang_module_signal_t signal; //!< for signal handlers } unlang_frame_state_module_t; static inline unlang_module_t *unlang_generic_to_module(unlang_t *p) diff --git a/src/modules/rlm_radius/rlm_radius.h b/src/modules/rlm_radius/rlm_radius.h index f8fa1475c4f..4b5691ffe9a 100644 --- a/src/modules/rlm_radius/rlm_radius.h +++ b/src/modules/rlm_radius/rlm_radius.h @@ -94,6 +94,6 @@ struct rlm_radius_io_s { FR_MODULE_THREADED_COMMON; rlm_radius_io_enqueue_t enqueue; //!< Enqueue a request_t with an IO submodule. - fr_unlang_module_signal_t signal; //!< Send a signal to an IO module. - fr_unlang_module_resume_t resume; //!< Resume a request, and get rcode. + unlang_module_signal_t signal; //!< Send a signal to an IO module. + unlang_module_resume_t resume; //!< Resume a request, and get rcode. };