we don't need unlang_module_resume_t any more.

it's just a module method

perl -p -i -e 's/unlang_module_resume_t/module_method_t/g' $(git grep -l unlang_module_resume_t src/)

diff --git a/src/lib/server/process.h b/src/lib/server/process.h
index d7088bce8c9b28fef35fc2cb23bf200f1125ea76..997efb05de6d5aa0d595388e2110684b5212ba78 100644 (file)
--- a/src/lib/server/process.h
+++ b/src/lib/server/process.h
@@ -90,14 +90,14 @@ typedef struct {
        size_t                  section_offset; //!< Where to look in the process instance for
                                                ///< a pointer to the section we should execute.
        rlm_rcode_t             rcode;          //!< Default rcode
-       unlang_module_resume_t  resume;         //!< Function to call after running a recv section.
+       module_method_t resume;         //!< Function to call after running a recv section.
 
        /*
         *      Each state has only one "recv" or "send".
         */
        union {
                module_method_t         recv;           //!< Method to call when receiving this type of packet.
-               unlang_module_resume_t  send;           //!< Method to call when sending this type of packet.
+               module_method_t send;           //!< Method to call when sending this type of packet.
        };
        PROCESS_STATE_EXTRA_FIELDS
 } fr_process_state_t;
@@ -152,7 +152,7 @@ do { \
  */
 #define CALL_SEND_TYPE(_x) call_send_type(process_state_reply[(request->reply->code = _x)].send, p_result, mctx, request)
 
-static inline unlang_action_t call_send_type(unlang_module_resume_t send, \
+static inline unlang_action_t call_send_type(module_method_t send, \
                                             rlm_rcode_t *p_result, module_ctx_t const *mctx,
                                             request_t *request)
 {

diff --git a/src/lib/unlang/module.c b/src/lib/unlang/module.c
index f7d7be5164822a11c92d976d2f0977e0bce478b6..de28e3e6a7e8e7687de14135dd7d2ef4d62d75b0 100644 (file)
--- a/src/lib/unlang/module.c
+++ b/src/lib/unlang/module.c
@@ -396,7 +396,7 @@ int unlang_module_push(rlm_rcode_t *p_result, request_t *request,
  *     - <0 on error
  *     - 0 on success
  */
-int unlang_module_set_resume(request_t *request, unlang_module_resume_t resume)
+int unlang_module_set_resume(request_t *request, module_method_t resume)
 {
        unlang_stack_t                  *stack = request->stack;
        unlang_stack_frame_t            *frame = &stack->frame[stack->depth];
@@ -446,7 +446,7 @@ int unlang_module_set_resume(request_t *request, unlang_module_resume_t resume)
  */
 unlang_action_t unlang_module_yield_to_xlat(TALLOC_CTX *ctx, bool *p_success, fr_value_box_list_t *out,
                                            request_t *request, xlat_exp_head_t const *exp,
-                                           unlang_module_resume_t resume,
+                                           module_method_t resume,
                                            unlang_module_signal_t signal, void *rctx)
 {
        /*
@@ -493,7 +493,7 @@ unlang_action_t unlang_module_yield_to_xlat(TALLOC_CTX *ctx, bool *p_success, fr
 unlang_action_t unlang_module_yield_to_tmpl(TALLOC_CTX *ctx, fr_value_box_list_t *out,
                                            request_t *request, tmpl_t const *vpt,
                                            unlang_tmpl_args_t *args,
-                                           unlang_module_resume_t resume,
+                                           module_method_t resume,
                                            unlang_module_signal_t signal, void *rctx)
 {
        /*
@@ -515,7 +515,7 @@ unlang_action_t unlang_module_yield_to_tmpl(TALLOC_CTX *ctx, fr_value_box_list_t
 unlang_action_t unlang_module_yield_to_section(rlm_rcode_t *p_result,
                                               request_t *request, CONF_SECTION *subcs,
                                               rlm_rcode_t default_rcode,
-                                              unlang_module_resume_t resume,
+                                              module_method_t resume,
                                               unlang_module_signal_t signal, void *rctx)
 {
        if (!subcs) {
@@ -571,7 +571,7 @@ unlang_action_t unlang_module_yield_to_section(rlm_rcode_t *p_result,
  *     - UNLANG_ACTION_YIELD.
  */
 unlang_action_t unlang_module_yield(request_t *request,
-                                   unlang_module_resume_t resume, unlang_module_signal_t signal, void *rctx)
+                                   module_method_t resume, unlang_module_signal_t signal, void *rctx)
 {
        unlang_stack_t                  *stack = request->stack;
        unlang_stack_frame_t            *frame = &stack->frame[stack->depth];
@@ -695,7 +695,7 @@ static unlang_action_t unlang_module_resume(rlm_rcode_t *p_result, request_t *re
 {
        unlang_frame_state_module_t     *state = talloc_get_type_abort(frame->state, unlang_frame_state_module_t);
        unlang_module_t                 *mc = unlang_generic_to_module(frame->instruction);
-       unlang_module_resume_t          resume;
+       module_method_t         resume;
        unlang_action_t                 ua;
 
        /*

diff --git a/src/lib/unlang/module.h b/src/lib/unlang/module.h
index 6f0d52498b96a0503858b33b08613a37cb213776..64caa339fd2c0f7ace0005264d883599baf7d219 100644 (file)
--- a/src/lib/unlang/module.h
+++ b/src/lib/unlang/module.h
@@ -64,18 +64,6 @@ typedef      void (*unlang_module_timeout_t)(module_ctx_t const *mctx, request_t *req
  */
 typedef void (*unlang_module_fd_event_t)(module_ctx_t const *mctx, request_t *request, int fd);
 
-/** A callback for when the request is resumed.
- *
- * The resumed request cannot call the normal "authorize", etc. method.  It needs a separate callback.
- *
- * @param[out] p_result                result of the operation.
- * @param[in] mctx             calling context for the module.
- *                             Contains global, thread-specific, and call-specific data for a module.
- * @param[in] request          the current request.
- * @return an instruction for the interpreter.
- */
-typedef unlang_action_t (*unlang_module_resume_t)(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request);
-
 /** A callback when the request gets a fr_state_signal_t.
  *
  * A module may call unlang_yeild(), but still need to do something on FR_SIGNAL_DUP.  If so, it's
@@ -107,10 +95,10 @@ int                unlang_module_push(rlm_rcode_t *p_result, request_t *request,
                                   module_instance_t *module_instance, module_method_t method, bool top_frame)
                                   CC_HINT(warn_unused_result);
 
-int            unlang_module_set_resume(request_t *request, unlang_module_resume_t resume);
+int            unlang_module_set_resume(request_t *request, module_method_t resume);
 
 unlang_action_t        unlang_module_yield_to_subrequest(rlm_rcode_t *p_result, request_t *child,
-                                                 unlang_module_resume_t resume,
+                                                 module_method_t resume,
                                                  unlang_module_signal_t signal,
                                                  unlang_subrequest_session_t const *session,
                                                  void *rctx);
@@ -118,22 +106,22 @@ unlang_action_t   unlang_module_yield_to_subrequest(rlm_rcode_t *p_result, request
 unlang_action_t        unlang_module_yield_to_section(rlm_rcode_t *p_result,
                                               request_t *request, CONF_SECTION *subcs,
                                               rlm_rcode_t default_rcode,
-                                              unlang_module_resume_t resume,
+                                              module_method_t resume,
                                               unlang_module_signal_t signal, void *rctx);
 
 unlang_action_t        unlang_module_yield_to_xlat(TALLOC_CTX *ctx, bool *p_success, fr_value_box_list_t *out,
                                            request_t *request, xlat_exp_head_t const *xlat,
-                                           unlang_module_resume_t resume,
+                                           module_method_t resume,
                                            unlang_module_signal_t signal, void *rctx);
 
 unlang_action_t        unlang_module_yield_to_tmpl(TALLOC_CTX *ctx, fr_value_box_list_t *out,
                                            request_t *request, tmpl_t const *vpt,
                                            unlang_tmpl_args_t *args,
-                                           unlang_module_resume_t resume,
+                                           module_method_t resume,
                                            unlang_module_signal_t signal, void *rctx);
 
 unlang_action_t        unlang_module_yield(request_t *request,
-                                   unlang_module_resume_t resume,
+                                   module_method_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 03a0376cd5f7d8c22a9b796b391dd35628b21912..48e5fc06ea2839f922a752ed5e513abed9634344 100644 (file)
--- a/src/lib/unlang/module_priv.h
+++ b/src/lib/unlang/module_priv.h
@@ -85,7 +85,7 @@ typedef struct {
         * @{
         */
        void                            *rctx;                  //!< for resume / signal
-       unlang_module_resume_t          resume;                 //!< resumption handler
+       module_method_t         resume;                 //!< resumption handler
        unlang_module_signal_t          signal;                 //!< for signal handlers
 
        /** @} */

diff --git a/src/modules/rlm_radius/rlm_radius.h b/src/modules/rlm_radius/rlm_radius.h
index ad49fc0f6e22c1d306d37c5af035b1c9e017e717..0b63546028142462f3f253ceb1a37f4dce240fb8 100644 (file)
--- a/src/modules/rlm_radius/rlm_radius.h
+++ b/src/modules/rlm_radius/rlm_radius.h
@@ -82,5 +82,5 @@ struct rlm_radius_io_s {
        module_t                common;                 //!< Common fields to all loadable modules.
        rlm_radius_io_enqueue_t enqueue;                //!< Enqueue a request_t with an IO submodule.
        unlang_module_signal_t  signal;                 //!< Send a signal to an IO module.
-       unlang_module_resume_t  resume;                 //!< Resume a request, and get rcode.
+       module_method_t resume;                 //!< Resume a request, and get rcode.
 };

diff --git a/src/modules/rlm_tacacs/rlm_tacacs.h b/src/modules/rlm_tacacs/rlm_tacacs.h
index d23672f5c7e9f24ed855328ab65ddd321ea56aac..0ca1bbf7e3ce651293bc02b9692bf108c435202f 100644 (file)
--- a/src/modules/rlm_tacacs/rlm_tacacs.h
+++ b/src/modules/rlm_tacacs/rlm_tacacs.h
@@ -74,5 +74,5 @@ struct rlm_tacacs_io_s {
        module_t                common;                 //!< Common fields to all loadable modules.
        rlm_tacacs_io_enqueue_t enqueue;                //!< Enqueue a request_t with an IO submodule.
        unlang_module_signal_t  signal;                 //!< Send a signal to an IO module.
-       unlang_module_resume_t  resume;                 //!< Resume a request, and get rcode.
+       module_method_t resume;                 //!< Resume a request, and get rcode.
 };