From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 19 Mar 2021 19:55:30 +0000 (+0000)
Subject: Add trace macro
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=245a982e487d36252a93c0faed484390682bda61;p=thirdparty%2Ffreeradius-server.git

Add trace macro
---

diff --git a/src/process/radius/base.c b/src/process/radius/base.c
index 97fec3bb4ff..220f2c7791f 100644
--- a/src/process/radius/base.c
+++ b/src/process/radius/base.c
@@ -322,6 +322,11 @@ static fr_packet_rcode_t disconnect_nak = {
 
 #define RAUTH(fmt, ...)		log_request(L_AUTH, L_DBG_LVL_OFF, request, __FILE__, __LINE__, fmt, ## __VA_ARGS__)
 
+#ifndef NDEBUG
+#  define TRACE	RDEBUG3("Entered state %s", __FUNCTION__)
+#else
+#  define TRACE
+#endif
 
 /*
  *	Return a short string showing the terminal server, port
@@ -476,6 +481,8 @@ RESUME(access_request)
 	radius_state_t const	*state;
 	process_radius_t	*inst = talloc_get_type_abort_const(mctx->instance, process_radius_t);
 
+	TRACE;
+
 	fr_assert(rcode < RLM_MODULE_NUMCODES);
 
 	UPDATE_STATE(packet);
@@ -528,6 +535,8 @@ RESUME(auth_type)
 	radius_state_t const	*state;
 	process_radius_t	*inst = talloc_get_type_abort_const(mctx->instance, process_radius_t);
 
+	TRACE;
+
 	fr_assert(rcode < RLM_MODULE_NUMCODES);
 	fr_assert(RADIUS_PACKET_CODE_VALID(request->reply->code));
 
@@ -618,6 +627,8 @@ RESUME(access_accept)
 	fr_pair_t *vp;
 	process_radius_t *inst = talloc_get_type_abort_const(mctx->instance, process_radius_t);
 
+	TRACE;
+
 	vp = fr_pair_find_by_da(&request->request_pairs, attr_module_success_message);
 	if (vp){
 		auth_message(&inst->auth, request, true, "Login OK (%pV)", &vp->data);
@@ -634,6 +645,8 @@ RESUME(access_reject)
 	fr_pair_t *vp;
 	process_radius_t *inst = talloc_get_type_abort_const(mctx->instance, process_radius_t);
 
+	TRACE;
+
 	vp = fr_pair_find_by_da(&request->request_pairs, attr_module_failure_message);
 	if (vp) {
 		auth_message(&inst->auth, request, false, "Login incorrect (%pV)", &vp->data);
@@ -651,6 +664,8 @@ RESUME(access_challenge)
 	radius_state_t const	*state;
 	process_radius_t	*inst = talloc_get_type_abort_const(mctx->instance, process_radius_t);
 
+	TRACE;
+
 	/*
 	 *	Cache the state context.
 	 *
@@ -675,6 +690,8 @@ RESUME(acct_type)
 	radius_state_t const	*state;
 	process_radius_t	*inst = talloc_get_type_abort_const(mctx->instance, process_radius_t);
 
+	TRACE;
+
 	fr_assert(rcode < RLM_MODULE_NUMCODES);
 	fr_assert(RADIUS_PACKET_CODE_VALID(request->reply->code));
 
@@ -711,6 +728,8 @@ RESUME(accounting_request)
 	radius_state_t const	*state;
 	process_radius_t	*inst = talloc_get_type_abort_const(mctx->instance, process_radius_t);
 
+	TRACE;
+
 	fr_assert(rcode < RLM_MODULE_NUMCODES);
 
 	UPDATE_STATE(packet);
@@ -774,6 +793,8 @@ RECV(generic)
 	radius_state_t const	*state;
 	process_radius_t	*inst = talloc_get_type_abort_const(mctx->instance, process_radius_t);
 
+	TRACE;
+
 	if (request->parent && RDEBUG_ENABLED) {
 		RDEBUG("Received %s ID %i", fr_packet_codes[request->packet->code], request->packet->id);
 		log_request_pair_list(L_DBG_LVL_1, request, NULL, &request->request_pairs, NULL);
@@ -802,6 +823,8 @@ RESUME(recv_generic)
 	radius_state_t const	*state;
 	process_radius_t	*inst = talloc_get_type_abort_const(mctx->instance, process_radius_t);
 
+	TRACE;
+
 	fr_assert(rcode < RLM_MODULE_NUMCODES);
 
 	UPDATE_STATE(packet);
@@ -823,7 +846,7 @@ SEND(generic)
 	radius_state_t const	*state;
 	process_radius_t	*inst = talloc_get_type_abort_const(mctx->instance, process_radius_t);
 
-	ERROR("HERE %s", __FUNCTION__);
+	TRACE;
 
 	fr_assert(RADIUS_PACKET_CODE_VALID(request->reply->code));
 
@@ -867,7 +890,7 @@ RESUME(send_generic)
 	radius_state_t const	*state;
 	process_radius_t	*inst = talloc_get_type_abort_const(mctx->instance, process_radius_t);
 
-	ERROR("HERE %s", __FUNCTION__);
+	TRACE;
 
 	fr_assert(RADIUS_PACKET_CODE_VALID(request->reply->code));
 
@@ -934,6 +957,8 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc
 {
 	radius_state_t 	const	*state;
 
+	TRACE;
+
 	fr_assert(RADIUS_PACKET_CODE_VALID(request->packet->code));
 
 	UPDATE_STATE(packet);