From 1c19a6ce2dcadca97490fed04fff59dcf90ae6e1 Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Thu, 5 Feb 2026 10:33:33 -0500 Subject: [PATCH] add WDEBUG / EDEBUG macros and use them in proto_radius --- src/lib/server/log.h | 12 ++++++++++++ src/listen/radius/proto_radius.c | 20 ++++++++++---------- src/protocols/radius/base.c | 4 ++-- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/lib/server/log.h b/src/lib/server/log.h index f39be8007fb..b0507544d7b 100644 --- a/src/lib/server/log.h +++ b/src/lib/server/log.h @@ -273,6 +273,18 @@ void log_global_free(void); #define PDEBUG3(_fmt, ...) _PDEBUG_LOG(L_DBG, L_DBG_LVL_3, _fmt, ## __VA_ARGS__) #define PDEBUG4(_fmt, ...) _PDEBUG_LOG(L_DBG, L_DBG_LVL_MAX, _fmt, ## __VA_ARGS__) #define PDEBUGX(_lvl, _fmt, ...) _PDEBUG_LOG(L_DBG, _lvl, _fmt, ## __VA_ARGS__) + +#define WDEBUG(_fmt, ...) _DEBUG_LOG(L_DBG_WARN, L_DBG_LVL_1, _fmt, ## __VA_ARGS__) +#define WDEBUG2(_fmt, ...) _DEBUG_LOG(L_DBG_WARN, L_DBG_LVL_2, _fmt, ## __VA_ARGS__) +#define WDEBUG3(_fmt, ...) _DEBUG_LOG(L_DBG_WARN, L_DBG_LVL_3, _fmt, ## __VA_ARGS__) +#define WDEBUG4(_fmt, ...) _DEBUG_LOG(L_DBG_WARN, L_DBG_LVL_MAX, _fmt, ## __VA_ARGS__) +#define WDEBUGX(_lvl, _fmt, ...) _DEBUG_LOG(L_DBG_WARN, _lvl, _fmt, ## __VA_ARGS__) + +#define EDEBUG(_fmt, ...) _DEBUG_LOG(L_DBG_ERR, L_DBG_LVL_1, _fmt, ## __VA_ARGS__) +#define EDEBUG2(_fmt, ...) _DEBUG_LOG(L_DBG_ERR, L_DBG_LVL_2, _fmt, ## __VA_ARGS__) +#define EDEBUG3(_fmt, ...) _DEBUG_LOG(L_DBG_ERR, L_DBG_LVL_3, _fmt, ## __VA_ARGS__) +#define EDEBUG4(_fmt, ...) _DEBUG_LOG(L_DBG_ERR, L_DBG_LVL_MAX, _fmt, ## __VA_ARGS__) +#define EDEBUGX(_lvl, _fmt, ...) _DEBUG_LOG(L_DBG_ERRR, _lvl, _fmt, ## __VA_ARGS__) /** @} */ /** @name Log request-specific messages (R*) diff --git a/src/listen/radius/proto_radius.c b/src/listen/radius/proto_radius.c index e89b180bbe6..1e1e4e26f25 100644 --- a/src/listen/radius/proto_radius.c +++ b/src/listen/radius/proto_radius.c @@ -238,17 +238,17 @@ void proto_radius_log(fr_listen_t *li, char const *name, fr_radius_decode_fail_t va_end(ap); if (sock) { - DEBUG2("proto_%s - discarding packet on socket %s from client %pV port %u - %s (%s)", - li->app_io->common.name, name, - fr_box_ipaddr(sock->inet.src_ipaddr), sock->inet.src_port, - msg, - fr_radius_decode_fail_reason[reason]); + EDEBUG2("proto_%s - discarding packet on socket %s from client %pV port %u - %s (%s)", + li->app_io->common.name, name, + fr_box_ipaddr(sock->inet.src_ipaddr), sock->inet.src_port, + msg, + fr_radius_decode_fail_reason[reason]); } else { - DEBUG2("proto_%s - discarding packet on socket %s - %s (%s)", - li->app_io->common.name, name, msg, fr_radius_decode_fail_reason[reason]); + EDEBUG2("proto_%s - discarding packet on socket %s - %s (%s)", + li->app_io->common.name, name, msg, fr_radius_decode_fail_reason[reason]); } - DEBUG2("For more information, please see " DOC_ROOT_URL "/troubleshooting/network/%s.html", url[reason]); + EDEBUG2("For more information, please see " DOC_ROOT_URL "/troubleshooting/network/%s.html", url[reason]); talloc_free(msg); } @@ -330,9 +330,9 @@ static int mod_decode(void const *instance, request_t *request, uint8_t *const d /* * @todo - print out socket name, too. */ - DEBUG2("proto_%s - discarding packet - failed decode (%s)", + EDEBUG2("proto_%s - discarding packet - failed decode (%s)", inst->io.app_io->common.name, fr_radius_decode_fail_reason[decode_ctx.reason]); - DEBUG2("For more information, please see " DOC_ROOT_URL "/troubleshooting/network/%s.html", + EDEBUG2("For more information, please see " DOC_ROOT_URL "/troubleshooting/network/%s.html", url[decode_ctx.reason]); return -1; diff --git a/src/protocols/radius/base.c b/src/protocols/radius/base.c index 8c97a96be8f..2cd38908fe5 100644 --- a/src/protocols/radius/base.c +++ b/src/protocols/radius/base.c @@ -525,10 +525,10 @@ char const *fr_radius_decode_fail_reason[FR_RADIUS_FAIL_MAX + 1] = { [FR_RADIUS_FAIL_MA_INVALID_LENGTH] = "Message-Authenticate has invalid length", [FR_RADIUS_FAIL_MA_MISSING] = "Message-Authenticator is required for this packet, but it is missing", - [FR_RADIUS_FAIL_MA_INVALID] = "Message-Authenticator fails verification (shared secret is incorrect)", + [FR_RADIUS_FAIL_MA_INVALID] = "Message-Authenticator fails verification. shared secret is incorrect", [FR_RADIUS_FAIL_PROXY_STATE_MISSING] = "Proxy-State is required for this request, but it is missing", - [FR_RADIUS_FAIL_VERIFY] = "packet fails verification (shared secret is incorrect)", + [FR_RADIUS_FAIL_VERIFY] = "packet fails verification, shared secret is incorrect", [FR_RADIUS_FAIL_NO_MATCHING_REQUEST] = "did not find request which matched response", [FR_RADIUS_FAIL_IO_ERROR] = "IO error", [FR_RADIUS_FAIL_MAX] = "???", -- 2.47.3