From 46822dded13c583d3ada0deeac885c2756c9ea3c Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Fri, 9 Apr 2021 07:38:14 -0400 Subject: [PATCH] reset request->module to NULL when unlang calls the process function, it thinks that it's calling a module, so it sets request->module = name of process function. This means that all debug messages (such as "received packet") are printed out, prefixed with the process name. This makes debug messages harder to read. Since the first thing the process function does is call an unlang section, we can safely set request->module=NULL, which omits the "radius - " prefix from the packet we're printing --- src/process/arp/base.c | 1 + src/process/dhcpv4/base.c | 1 + src/process/dhcpv6/base.c | 1 + src/process/radius/base.c | 1 + src/process/tacacs/base.c | 1 + src/process/vmps/base.c | 1 + 6 files changed, 6 insertions(+) diff --git a/src/process/arp/base.c b/src/process/arp/base.c index 87fc9fca3f..1569f9c349 100644 --- a/src/process/arp/base.c +++ b/src/process/arp/base.c @@ -188,6 +188,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc fr_assert(PROCESS_PACKET_CODE_VALID(request->packet->code)); request->component = "arp"; + request->module = NULL; fr_assert(request->dict == dict_arp); UPDATE_STATE(packet); diff --git a/src/process/dhcpv4/base.c b/src/process/dhcpv4/base.c index a2a3cb3f35..e07ccf19ae 100644 --- a/src/process/dhcpv4/base.c +++ b/src/process/dhcpv4/base.c @@ -316,6 +316,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc fr_assert(PROCESS_PACKET_CODE_VALID(request->packet->code)); request->component = "dhcpv4"; + request->module = NULL; fr_assert(request->dict == dict_dhcpv4); UPDATE_STATE(packet); diff --git a/src/process/dhcpv6/base.c b/src/process/dhcpv6/base.c index 134ca51592..6d8c6f1528 100644 --- a/src/process/dhcpv6/base.c +++ b/src/process/dhcpv6/base.c @@ -482,6 +482,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc fr_assert(PROCESS_PACKET_CODE_VALID(request->packet->code)); request->component = "dhcpv6"; + request->module = NULL; fr_assert(request->dict == dict_dhcpv6); UPDATE_STATE(packet); diff --git a/src/process/radius/base.c b/src/process/radius/base.c index 00f9a7fbb6..4e0de31f3b 100644 --- a/src/process/radius/base.c +++ b/src/process/radius/base.c @@ -783,6 +783,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc fr_assert(FR_RADIUS_PACKET_CODE_VALID(request->packet->code)); request->component = "radius"; + request->module = NULL; fr_assert(request->dict == dict_radius); UPDATE_STATE(packet); diff --git a/src/process/tacacs/base.c b/src/process/tacacs/base.c index c526e3133c..0220876297 100644 --- a/src/process/tacacs/base.c +++ b/src/process/tacacs/base.c @@ -569,6 +569,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc fr_assert(PROCESS_PACKET_CODE_VALID(request->packet->code)); request->component = "tacacs"; + request->module = NULL; fr_assert(request->dict == dict_tacacs); UPDATE_STATE(packet); diff --git a/src/process/vmps/base.c b/src/process/vmps/base.c index 4adb67ed6b..e6469d4634 100644 --- a/src/process/vmps/base.c +++ b/src/process/vmps/base.c @@ -212,6 +212,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc fr_assert(PROCESS_PACKET_CODE_VALID(request->packet->code)); request->component = "vmps"; + request->module = NULL; fr_assert(request->dict == dict_vmps); UPDATE_STATE(packet); -- 2.47.2