From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sun, 21 Mar 2021 23:11:13 +0000 (+0000)
Subject: Remove some references to unlang_interpret
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e751d95c7b14c3aabbe6ddf155a097b95f391eae;p=thirdparty%2Ffreeradius-server.git

Remove some references to unlang_interpret
---

diff --git a/src/lib/unlang/io.c b/src/lib/unlang/io.c
index e7ffcc598b7..828814a01ba 100644
--- a/src/lib/unlang/io.c
+++ b/src/lib/unlang/io.c
@@ -27,35 +27,6 @@ RCSID("$Id$")
 #include <freeradius-devel/io/listen.h>
 #include "unlang_priv.h"
 
-/** Run the interpreter after creating a subrequest.
- *
- * Just run some "unlang", but don't do anything else.
- *
- * This is a shim function added to 'fake' requests by the subrequest and parallel keywords.
- */
-unlang_action_t unlang_io_process_interpret(rlm_rcode_t *p_result, UNUSED module_ctx_t const *mctx, request_t *request)
-{
-	rlm_rcode_t rcode;
-
-	REQUEST_VERIFY(request);
-
-	rcode = unlang_interpret(request);
-
-	/*
-	 *	We've yielded, and can keep running.  Do so.
-	 */
-	if ((rcode == RLM_MODULE_YIELD) &&
-	    (request->master_state != REQUEST_STOP_PROCESSING)) {
-		*p_result = RLM_MODULE_YIELD;
-		return UNLANG_ACTION_YIELD;
-	}
-
-	/*
-	 *	Don't bother setting request->reply->code.
-	 */
-	RETURN_MODULE_HANDLED;
-}
-
 /** Allocate a child request based on the parent.
  *
  * @param[in] parent		spawning the child request.
@@ -107,13 +78,6 @@ request_t *unlang_io_subrequest_alloc(request_t *parent, fr_dict_t const *namesp
 	COPY_FIELD(recv_time);
 	fr_assert(request_is_internal(child));
 
-	/*
-	 *	Always set the "process" function to the local
-	 *	bare-bones function which just runs on section of
-	 *	"unlang", and doesn't send replies or anything else.
-	 */
-	child->async->process = unlang_io_process_interpret;
-
 	REQUEST_VERIFY(child);
 
 	return child;
diff --git a/src/lib/unlang/parallel.c b/src/lib/unlang/parallel.c
index 2aa6ba227ce..b192e475a5c 100644
--- a/src/lib/unlang/parallel.c
+++ b/src/lib/unlang/parallel.c
@@ -153,10 +153,6 @@ static unlang_action_t unlang_parallel_child_done(UNUSED rlm_rcode_t *p_result,
 	 *	Otherwise we're a detached child, and we don't tell
 	 *	the parent anything.  Because we have that kind of
 	 *	relationship.
-	 *
-	 *	Note that we call unlang_interpret_mark_runnable() here
-	 *	because unlang_parallel_process() calls
-	 *	unlang_interpret(), and NOT child->async->process.
 	 */
 	if (child->state == CHILD_RUNNABLE) {
 		/*
diff --git a/src/lib/unlang/unlang_priv.h b/src/lib/unlang/unlang_priv.h
index 4a551a1ad5d..51600e647af 100644
--- a/src/lib/unlang/unlang_priv.h
+++ b/src/lib/unlang/unlang_priv.h
@@ -379,8 +379,6 @@ void		unlang_op_free(void);
  *
  * @{
  */
-unlang_action_t unlang_io_process_interpret(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request);
-
 request_t		*unlang_io_subrequest_alloc(request_t *parent, fr_dict_t const *namespace, bool detachable);
 
 /** @} */