From: Alan T. DeKok Date: Thu, 22 Jun 2023 13:57:10 +0000 (-0400) Subject: remove request->async->process X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3376bc0535485e781a07d3c72fc83872a131776e;p=thirdparty%2Ffreeradius-server.git remove request->async->process it hasn't been used for a while --- diff --git a/src/lib/io/listen.h b/src/lib/io/listen.h index 2daf4432de3..610d3846bb3 100644 --- a/src/lib/io/listen.h +++ b/src/lib/io/listen.h @@ -51,9 +51,6 @@ struct fr_listen { * Minimal data structure to use the new code. */ struct fr_async_s { - module_method_t process; //!< The current state function. - void *process_inst; //!< Instance data for the current state machine. - fr_time_t recv_time; fr_event_list_t *el; diff --git a/src/lib/io/worker.c b/src/lib/io/worker.c index cc132f7becc..99afd0272ba 100644 --- a/src/lib/io/worker.c +++ b/src/lib/io/worker.c @@ -711,7 +711,6 @@ static void worker_send_reply(fr_worker_t *worker, request_t *request, bool send #ifndef NDEBUG request->async->el = NULL; - request->async->process = NULL; request->async->channel = NULL; request->async->packet_ctx = NULL; request->async->listen = NULL; diff --git a/src/lib/server/auth.c b/src/lib/server/auth.c index 7b2bb174ef4..4a5c48eb18f 100644 --- a/src/lib/server/auth.c +++ b/src/lib/server/auth.c @@ -47,11 +47,17 @@ RCSID("$Id$") */ unlang_action_t rad_virtual_server(rlm_rcode_t *p_result, request_t *request) { - rlm_rcode_t final; - - RDEBUG("Virtual server %s received request", cf_section_name2(unlang_call_current(request))); + RDEBUG("Virtual server %s received request NOT IMPLEMENTED", cf_section_name2(unlang_call_current(request))); log_request_pair_list(L_DBG_LVL_1, request, NULL, &request->request_pairs, NULL); + /* + * Just push the virtual server onto the stack? + * + * Except that the caller expects this function to be run + * _synchronously_, and all of that needs to be fixed. + */ + RETURN_MODULE_FAIL; + #if 0 { fr_pair_t *username, *parent_username = NULL; @@ -155,7 +161,6 @@ unlang_action_t rad_virtual_server(rlm_rcode_t *p_result, request_t *request) } } } -#endif if (!request->async) { #ifdef STATIC_ANALYZER @@ -185,6 +190,7 @@ unlang_action_t rad_virtual_server(rlm_rcode_t *p_result, request_t *request) } RETURN_MODULE_OK; +#endif } /* diff --git a/src/lib/server/request.h b/src/lib/server/request.h index 65b6cb23ead..e7352a6e12a 100644 --- a/src/lib/server/request.h +++ b/src/lib/server/request.h @@ -75,9 +75,6 @@ typedef enum request_state_t { REQUEST_OTHER_4, } request_state_t; -typedef void (*fr_request_process_t)(request_t *, fr_signal_t); //!< Function handler for requests. -typedef rlm_rcode_t (*RAD_REQUEST_FUNP)(request_t *); - extern HIDDEN fr_dict_attr_t const *request_attr_root; extern fr_dict_attr_t const *request_attr_request; extern fr_dict_attr_t const *request_attr_reply;