Remove request->listener

diff --git a/src/lib/server/request.c b/src/lib/server/request.c
index c9c496ac1de440923694fcbac9251aae5f74d93b..062c7015d4b2b8db8ecd1b7b26db6a5f23b38b9e 100644 (file)
--- 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 d143220475661660c91b015ffcb361629bbe015a..1e30c234674df1c120d023322e598dd3b3e94b2a 100644 (file)
--- 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 71a8bc15a2310030809343062e4eefd99d9a17c0..240c93ea2761e1493aa405e7e6f08f186d8cc884 100644 (file)
--- 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 0b808bf1a3a936cacdcca718f2cf35ccfe0159cd..e1427324019e9cf184e5042ece522081f67a2242 100644 (file)
--- 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;
 
        /*