From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sun, 14 Feb 2021 22:16:08 +0000 (+0000)
Subject: Remove request->listener
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc397870eafa61d287331444057ae10eb05084b7;p=thirdparty%2Ffreeradius-server.git

Remove request->listener
---

diff --git a/src/lib/server/request.c b/src/lib/server/request.c
index c9c496ac1de..062c7015d4b 100644
--- a/src/lib/server/request.c
+++ b/src/lib/server/request.c
@@ -167,11 +167,6 @@ static inline CC_HINT(always_inline) int request_child_init(request_t *child, re
 	child->packet->code = parent->packet->code;
 	child->packet->timestamp = parent->packet->timestamp;
 
-	/*
-	 *	Required for new identity support
-	 */
-	child->listener = parent->listener;
-
 	/*
 	 *	Fill in the child reply, based on the child request.
 	 */
diff --git a/src/lib/server/request.h b/src/lib/server/request.h
index d1432204756..1e30c234674 100644
--- a/src/lib/server/request.h
+++ b/src/lib/server/request.h
@@ -192,7 +192,6 @@ struct request_s {
 
 	fr_dlist_head_t		data;		//!< Request metadata.
 
-	rad_listen_t		*listener;	//!< The listener that received the request.
 	RADCLIENT		*client;	//!< The client that originally sent us the request.
 
 	rad_master_state_t	master_state;	//!< Set by the master thread to signal the child that's currently
diff --git a/src/lib/server/stats.c b/src/lib/server/stats.c
index 71a8bc15a23..240c93ea276 100644
--- a/src/lib/server/stats.c
+++ b/src/lib/server/stats.c
@@ -49,14 +49,17 @@ void request_stats_final(request_t *request)
 {
 	if (request->master_state == REQUEST_COUNTED) return;
 
+#if 0
 	if (!request->listener) return;
 	if (!request->client) return;
 	if (!request->packet) return;
+#endif
 
+#if 0
 	if ((request->listener->type != RAD_LISTEN_NONE) &&
 	    (request->listener->type != RAD_LISTEN_ACCT) &&
 	    (request->listener->type != RAD_LISTEN_AUTH)) return;
-
+#endif
 	/* don't count statistic requests */
 	if (request->packet->code == FR_CODE_STATUS_SERVER)
 		return;
diff --git a/src/modules/rlm_client/rlm_client.c b/src/modules/rlm_client/rlm_client.c
index 0b808bf1a3a..e1427324019 100644
--- a/src/modules/rlm_client/rlm_client.c
+++ b/src/modules/rlm_client/rlm_client.c
@@ -321,14 +321,11 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, UNU
 	 */
 	if (request->client->server) {
 		server_cs = request->client->server_cs;
-
-	} else if (request->listener) {
-		server_cs = request->listener->server_cs;
 	} else {
 		RETURN_MODULE_FAIL;
 	}
 
-	c = client_read(buffer, server_cs, true);
+	c = client_read(buffer, request->server_cs, true);
 	if (!c) RETURN_MODULE_FAIL;
 
 	/*