From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 5 Sep 2017 14:37:17 +0000 (-0400)
Subject: remove more unused fields from REQUEST
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f84833678e166b3b50d89f1059fc409dd44526a3;p=thirdparty%2Ffreeradius-server.git

remove more unused fields from REQUEST
---

diff --git a/src/include/radiusd.h b/src/include/radiusd.h
index ef4a3aa3454..1ac7e3483c0 100644
--- a/src/include/radiusd.h
+++ b/src/include/radiusd.h
@@ -241,8 +241,6 @@ struct rad_request {
 
 	request_data_t		*data;		//!< Request metadata.
 
-	RAD_LISTEN_TYPE		priority;
-
 	rad_listen_t		*listener;	//!< The listener that received the request.
 	RADCLIENT		*client;	//!< The client that originally sent us the request.
 
@@ -264,16 +262,9 @@ struct rad_request {
 
 	rad_master_state_t	master_state;	//!< Set by the master thread to signal the child that's currently
 						//!< working with the request, to do something.
-	rad_child_state_t	child_state;
-
-	pthread_t    		child_pid;	//!< Current thread handling the request.
-	void			*thread_ctx;	//!< for request_queue_extract()
 
 	fr_request_process_t	process;	//!< The function to call to move the request through the state machine.
 
-	RAD_REQUEST_FUNP	handle;		//!< The function to call to move the request through the
-						//!< various server configuration sections.
-
 	rlm_rcode_t		rcode;		//!< Last rcode returned by a module
 	CONF_SECTION		*server_cs;	//!< virtual server which is processing the request.
 
@@ -300,10 +291,6 @@ struct rad_request {
 
 	main_config_t		*root;		//!< Pointer to the main config hack to try and deal with hup.
 
-#ifdef WITH_PROXY
-	bool			in_proxy_hash;
-#endif
-
 	struct {
 		log_dst_t	*dst;		//!< First in a list of log destinations.
 
diff --git a/src/main/request.c b/src/main/request.c
index e8aa3aa786f..27a252ddf13 100644
--- a/src/main/request.c
+++ b/src/main/request.c
@@ -147,7 +147,6 @@ REQUEST *request_alloc_fake(REQUEST *request)
 	fake->number = request->number;
 	fake->seq_start = request->seq_start;
 
-	fake->child_pid = request->child_pid;
 	fake->parent = request;
 	fake->root = request->root;
 	fake->client = request->client;
@@ -174,7 +173,6 @@ REQUEST *request_alloc_fake(REQUEST *request)
 	}
 
 	fake->master_state = REQUEST_ACTIVE;
-	fake->child_state = REQUEST_RUNNING;
 
 	/*
 	 *	Fill in the fake request.
diff --git a/src/main/unit_test_module.c b/src/main/unit_test_module.c
index 7e2794ac421..d06ba0c3fb6 100644
--- a/src/main/unit_test_module.c
+++ b/src/main/unit_test_module.c
@@ -126,8 +126,6 @@ static REQUEST *request_from_file(FILE *fp, fr_event_list_t *el, RADCLIENT *clie
 	request->number = number++;
 
 	request->master_state = REQUEST_ACTIVE;
-	request->child_state = REQUEST_RUNNING;
-	request->handle = NULL;
 	request->server_cs = virtual_server_find("default");
 
 	request->root = &main_config;