Rename unlang_action to unlang_signal in some places

diff --git a/src/include/modules.h b/src/include/modules.h
index 4196708fbcbf6b6ac25329b0cf1cacb3f87f4684..5a28b78a05f744abca017d238c2566d0a6b57f6f 100644 (file)
--- a/src/include/modules.h
+++ b/src/include/modules.h
@@ -292,7 +292,7 @@ int         unlang_event_fd_delete(REQUEST *request, void const *ctx, int fd);
 
 void           unlang_resumable(REQUEST *request);
 
-void           unlang_action(REQUEST *request, fr_state_action_t action);
+void           unlang_signal(REQUEST *request, fr_state_action_t action);
 
 rlm_rcode_t    unlang_module_yield(REQUEST *request, fr_unlang_module_resume_t callback, fr_unlang_action_t action_callback,
                             void const *ctx);

diff --git a/src/main/unlang_interpret.c b/src/main/unlang_interpret.c
index b8e8475faa0f4ad63d12612cca10231570769d24..71adb0c2b47b2440650caab66272b1d00f5cc254 100644 (file)
--- a/src/main/unlang_interpret.c
+++ b/src/main/unlang_interpret.c
@@ -1745,7 +1745,7 @@ void unlang_resumable(REQUEST *request)
  * @param[in] request          The current request.
  * @param[in] action           to signal.
  */
-void unlang_action(REQUEST *request, fr_state_action_t action)
+void unlang_signal(REQUEST *request, fr_state_action_t action)
 {
        unlang_stack_frame_t            *frame;
        unlang_stack_t                  *stack = request->stack;
@@ -1759,11 +1759,11 @@ void unlang_action(REQUEST *request, fr_state_action_t action)
        rad_assert(frame->instruction->type == UNLANG_TYPE_MODULE_RESUME);
 
        mr = unlang_generic_to_module_resumption(frame->instruction);
-       if (!mr->action_callback) return;
+       if (!mr->signal_callback) return;
 
        memcpy(&mutable, &mr->ctx, sizeof(mutable));
 
-       mr->action_callback(request, mr->module.module_instance->data, mr->thread, mutable, action);
+       mr->signal_callback(request, mr->module.module_instance->data, mr->thread, mutable, action);
 }
 
 /** Yield a request back to the interpreter from within a module
@@ -1778,12 +1778,12 @@ void unlang_action(REQUEST *request, fr_state_action_t action)
  *
  * @param[in] request          The current request.
  * @param[in] callback         to call on unlang_resumable().
- * @param[in] action_callback  to call on unlang_action().
+ * @param[in] signal_callback  to call on unlang_action().
  * @param[in] ctx              to pass to the callbacks.
  * @return always returns RLM_MODULE_YIELD.
  */
 rlm_rcode_t unlang_module_yield(REQUEST *request, fr_unlang_module_resume_t callback,
-                               fr_unlang_action_t action_callback, void const *ctx)
+                               fr_unlang_action_t signal_callback, void const *ctx)
 {
        unlang_stack_frame_t            *frame;
        unlang_stack_t                  *stack = request->stack;
@@ -1805,7 +1805,7 @@ rlm_rcode_t unlang_module_yield(REQUEST *request, fr_unlang_module_resume_t call
        mr->thread = frame->modcall.thread;
        mr->module.self.type = UNLANG_TYPE_MODULE_RESUME;
        mr->callback = callback;
-       mr->action_callback = action_callback;
+       mr->signal_callback = signal_callback;
        mr->thread = module_thread_instance_find(sp->module_instance);
        mr->ctx = ctx;