Move pair list logging functions into log.c

FreeRADIUS · May 16, 2018 · 7f26675 · 7f26675
1 parent a6d3dcf
commit 7f26675
Show file tree

Hide file tree

Showing 29 changed files with 110 additions and 106 deletions.
diff --git a/src/include/log.h b/src/include/log.h
@@ -84,6 +84,10 @@ void	log_request_error(fr_log_type_t type, fr_log_lvl_t lvl, REQUEST *request, c
 void	log_request_perror(fr_log_type_t type, fr_log_lvl_t lvl, REQUEST *request, char const *msg, ...)
 	CC_HINT(format (printf, 4, 5)) CC_HINT(nonnull (3));
 
+void	log_request_pair_list(fr_log_lvl_t lvl, REQUEST *request, VALUE_PAIR *vp, char const *prefix);
+
+void	log_request_proto_pair_list(fr_log_lvl_t lvl, REQUEST *request, VALUE_PAIR *vp, char const *prefix);
+
 void	log_request_marker(fr_log_type_t type, fr_log_lvl_t lvl, REQUEST *request,
 			      char const *fmt, size_t indent, char const *error)
 	CC_HINT(nonnull);

diff --git a/src/include/radiusd.h b/src/include/radiusd.h
@@ -362,8 +362,8 @@ typedef enum {
 
 
 /* radiusd.c */
-void		rdebug_pair_list(fr_log_lvl_t level, REQUEST *request, VALUE_PAIR *vp, char const *prefix);
-void		rdebug_proto_pair_list(fr_log_lvl_t level, REQUEST *request, VALUE_PAIR *vp, char const *prefix);
+void		log_request_pair_list(fr_log_lvl_t level, REQUEST *request, VALUE_PAIR *vp, char const *prefix);
+void		log_request_proto_pair_list(fr_log_lvl_t level, REQUEST *request, VALUE_PAIR *vp, char const *prefix);
 int		log_err (char *);
 
 /* util.c */

diff --git a/src/lib/tls/validate.c b/src/lib/tls/validate.c
@@ -150,7 +150,7 @@ int tls_validate_cert_cb(int ok, X509_STORE_CTX *x509_ctx)
 			/*
 			 *	Print out all the pairs we have so far
 			 */
-			rdebug_pair_list(L_DBG_LVL_2, request, cert_vps, "&session-state:");
+			log_request_pair_list(L_DBG_LVL_2, request, cert_vps, "&session-state:");
 
 			/*
 			 *	cert_vps have a different talloc parent, so we

diff --git a/src/main/auth.c b/src/main/auth.c
@@ -535,7 +535,7 @@ rlm_rcode_t rad_virtual_server(REQUEST *request)
 	VALUE_PAIR *vp;
 
 	RDEBUG("Virtual server %s received request", cf_section_name2(request->server_cs));
-	rdebug_pair_list(L_DBG_LVL_1, request, request->packet->vps, NULL);
+	log_request_pair_list(L_DBG_LVL_1, request, request->packet->vps, NULL);
 
 	if (!request->username) {
 		request->username = fr_pair_find_by_num(request->packet->vps, 0, FR_USER_NAME, TAG_ANY);
@@ -662,7 +662,7 @@ rlm_rcode_t rad_virtual_server(REQUEST *request)
 	RDEBUG("} # server %s", cf_section_name2(request->server_cs));
 
 	RDEBUG("Virtual server sending reply");
-	rdebug_pair_list(L_DBG_LVL_1, request, request->reply->vps, NULL);
+	log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, NULL);
 
 	return rcode;
 }
@@ -708,8 +708,8 @@ void common_packet_debug(REQUEST *request, RADIUS_PACKET *packet, bool received)
 		       packet->data_len);
 
 	if (received) {
-		rdebug_pair_list(L_DBG_LVL_1, request, packet->vps, NULL);
+		log_request_pair_list(L_DBG_LVL_1, request, packet->vps, NULL);
 	} else {
-		rdebug_proto_pair_list(L_DBG_LVL_1, request, packet->vps, NULL);
+		log_request_proto_pair_list(L_DBG_LVL_1, request, packet->vps, NULL);
 	}
 }
diff --git a/src/main/log.c b/src/main/log.c
@@ -495,7 +495,7 @@ void vlog_module_failure_msg(REQUEST *request, char const *msg, va_list ap)
 	p = talloc_vasprintf(request, msg, aq);
 	va_end(aq);
 
-	MEM(vp = pair_make_request("Module-Failure-Message", NULL, T_OP_ADD));
+	MEM(pair_add_request(&vp, attr_module_failure_message) >= 0);
 	if (request->module && (request->module[0] != '\0')) {
 		fr_pair_value_snprintf(vp, "%s: %s", request->module, p);
 	} else {
@@ -637,6 +637,59 @@ void log_request_perror(fr_log_type_t type, fr_log_lvl_t lvl, REQUEST *request,
 	}
 }
 
+/** Print a list of VALUE_PAIRs.
+ *
+ * @param[in] lvl	Debug lvl (1-4).
+ * @param[in] request	to read logging params from.
+ * @param[in] vp	to print.
+ * @param[in] prefix	(optional).
+ */
+void log_request_pair_list(fr_log_lvl_t lvl, REQUEST *request, VALUE_PAIR *vp, char const *prefix)
+{
+	fr_cursor_t cursor;
+
+	if (!vp || !request || !request->log.dst) return;
+
+	if (!log_debug_enabled(L_DBG, lvl, request)) return;
+
+	RINDENT();
+	for (vp = fr_cursor_init(&cursor, &vp);
+	     vp;
+	     vp = fr_cursor_next(&cursor)) {
+		VP_VERIFY(vp);
+
+		RDEBUGX(lvl, "%s%pP", prefix ? prefix : "&", vp);
+	}
+	REXDENT();
+}
+
+/** Print a list of protocol VALUE_PAIRs.
+ *
+ * @param[in] lvl	Debug lvl (1-4).
+ * @param[in] request	to read logging params from.
+ * @param[in] vp	to print.
+ * @param[in] prefix	(optional).
+ */
+void log_request_proto_pair_list(fr_log_lvl_t lvl, REQUEST *request, VALUE_PAIR *vp, char const *prefix)
+{
+	fr_cursor_t cursor;
+
+	if (!vp || !request || !request->log.dst) return;
+
+	if (!log_debug_enabled(L_DBG, lvl, request)) return;
+
+	RINDENT();
+	for (vp = fr_cursor_init(&cursor, &vp);
+	     vp;
+	     vp = fr_cursor_next(&cursor)) {
+		VP_VERIFY(vp);
+		if (vp->da->flags.internal) continue;
+
+		RDEBUGX(lvl, "%s%pP", prefix ? prefix : "&", vp);
+	}
+	REXDENT();
+}
+
 /** Write the string being parsed, and a marker showing where the parse error occurred
  *
  * @param[in] type	the log category.
@@ -647,7 +700,7 @@ void log_request_perror(fr_log_type_t type, fr_log_lvl_t lvl, REQUEST *request,
  * @param[in] error	What the parse error was.
  */
 void log_request_marker(fr_log_type_t type, fr_log_lvl_t lvl, REQUEST *request,
-			   char const *msg, size_t idx, char const *error)
+			char const *msg, size_t idx, char const *error)
 {
 	char const *prefix = "";
 	uint8_t unlang_indent;

diff --git a/src/main/pair.c b/src/main/pair.c
@@ -692,56 +692,3 @@ int xlat_eval_do(REQUEST *request, VALUE_PAIR *vp)
 
 	return 0;
 }
-
-/** Print a list of VALUE_PAIRs.
- *
- * @param[in] level Debug level (1-4).
- * @param[in] request to read logging params from.
- * @param[in] vp to print.
- * @param[in] prefix (optional).
- */
-void rdebug_pair_list(fr_log_lvl_t level, REQUEST *request, VALUE_PAIR *vp, char const *prefix)
-{
-	fr_cursor_t cursor;
-
-	if (!vp || !request || !request->log.dst) return;
-
-	if (!log_debug_enabled(L_DBG, level, request)) return;
-
-	RINDENT();
-	for (vp = fr_cursor_init(&cursor, &vp);
-	     vp;
-	     vp = fr_cursor_next(&cursor)) {
-		VP_VERIFY(vp);
-
-		RDEBUGX(level, "%s%pP", prefix ? prefix : "&", vp);
-	}
-	REXDENT();
-}
-
-/** Print a list of protocol VALUE_PAIRs.
- *
- * @param[in] level Debug level (1-4).
- * @param[in] request to read logging params from.
- * @param[in] vp to print.
- * @param[in] prefix (optional).
- */
-void rdebug_proto_pair_list(fr_log_lvl_t level, REQUEST *request, VALUE_PAIR *vp, char const *prefix)
-{
-	fr_cursor_t cursor;
-
-	if (!vp || !request || !request->log.dst) return;
-
-	if (!log_debug_enabled(L_DBG, level, request)) return;
-
-	RINDENT();
-	for (vp = fr_cursor_init(&cursor, &vp);
-	     vp;
-	     vp = fr_cursor_next(&cursor)) {
-		VP_VERIFY(vp);
-		if (vp->da->flags.internal) continue;
-
-		RDEBUGX(level, "%s%pP", prefix ? prefix : "&", vp);
-	}
-	REXDENT();
-}
diff --git a/src/main/state.c b/src/main/state.c
@@ -612,7 +612,7 @@ void fr_state_to_request(fr_state_tree_t *state, REQUEST *request, RADIUS_PACKET
 
 	if (request->state) {
 		RDEBUG2("Restored &session-state");
-		rdebug_pair_list(L_DBG_LVL_2, request, request->state, "&session-state:");
+		log_request_pair_list(L_DBG_LVL_2, request, request->state, "&session-state:");
 	}
 
 	/*
@@ -645,7 +645,7 @@ int fr_request_to_state(fr_state_tree_t *state, REQUEST *request, RADIUS_PACKET
 
 	if (request->state) {
 		RDEBUG2("Saving &session-state");
-		rdebug_pair_list(L_DBG_LVL_2, request, request->state, "&session-state:");
+		log_request_pair_list(L_DBG_LVL_2, request, request->state, "&session-state:");
 	}
 
 	PTHREAD_MUTEX_LOCK(&state->mutex);

diff --git a/src/modules/proto_detail/proto_detail_process.c b/src/modules/proto_detail/proto_detail_process.c
@@ -70,7 +70,7 @@ static fr_io_final_t mod_process(REQUEST *request, fr_io_action_t action)
 		RDEBUG("Received %s ID %i",
 		       fr_dict_enum_alias_by_value(attr_packet_type, fr_box_uint32(request->reply->code)),
 		       request->packet->id);
-		rdebug_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
+		log_request_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
 
 		request->component = "radius";
 
@@ -192,7 +192,7 @@ static fr_io_final_t mod_process(REQUEST *request, fr_io_action_t action)
 			       request->reply->id);
 		}
 
-		rdebug_proto_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
+		log_request_proto_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
 		break;
 
 	default:

diff --git a/src/modules/proto_dhcpv4/old.c b/src/modules/proto_dhcpv4/old.c
@@ -1035,9 +1035,9 @@ static void dhcp_packet_debug(REQUEST *request, RADIUS_PACKET *packet, bool rece
 	}
 
 	if (received) {
-		rdebug_pair_list(L_DBG_LVL_2, request, packet->vps, NULL);
+		log_request_pair_list(L_DBG_LVL_2, request, packet->vps, NULL);
 	} else {
-		rdebug_proto_pair_list(L_DBG_LVL_2, request, packet->vps, NULL);
+		log_request_proto_pair_list(L_DBG_LVL_2, request, packet->vps, NULL);
 	}
 }
 

diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4_all.c b/src/modules/proto_dhcpv4/proto_dhcpv4_all.c
@@ -44,7 +44,7 @@ static fr_io_final_t mod_process(REQUEST *request, UNUSED fr_io_action_t action)
 	case REQUEST_INIT:
 		log_request(L_DBG, L_DBG_LVL_1, request, "Received %s ID %08x",
 			       dhcp_message_types[request->packet->code], request->packet->id);
-		rdebug_proto_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
+		log_request_proto_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
 
 		request->component = "dhcpv4";
 

diff --git a/src/modules/proto_ldap_sync/proto_ldap_sync.c b/src/modules/proto_ldap_sync/proto_ldap_sync.c
@@ -322,7 +322,7 @@ static void request_running(REQUEST *request, fr_state_signal_t action)
 	switch (request->request_state) {
 	case REQUEST_INIT:
 		if (RDEBUG_ENABLED) proto_ldap_packet_debug(request, request->packet, true);
-		rdebug_proto_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
+		log_request_proto_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
 
 		request->server_cs = request->listener->server_cs;
 		request->component = "ldap";

diff --git a/src/modules/proto_radius/proto_radius_acct.c b/src/modules/proto_radius/proto_radius_acct.c
@@ -52,7 +52,7 @@ static fr_io_final_t mod_process(REQUEST *request, fr_io_action_t action)
 	switch (request->request_state) {
 	case REQUEST_INIT:
 		RDEBUG("Received %s ID %i", fr_packet_codes[request->packet->code], request->packet->id);
-		rdebug_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
+		log_request_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
 
 		request->component = "radius";
 
@@ -158,7 +158,7 @@ static fr_io_final_t mod_process(REQUEST *request, fr_io_action_t action)
 		 */
 		if (request->parent) {
 			RDEBUG("Sent %s ID %i", fr_packet_codes[request->reply->code], request->reply->id);
-			rdebug_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
+			log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
 			return FR_IO_DONE;
 		}
 

diff --git a/src/modules/proto_radius/proto_radius_auth.c b/src/modules/proto_radius/proto_radius_auth.c
@@ -139,7 +139,7 @@ static fr_io_final_t mod_process(REQUEST *request, fr_io_action_t action)
 	switch (request->request_state) {
 	case REQUEST_INIT:
 		RDEBUG("Received %s ID %i", fr_packet_codes[request->packet->code], request->packet->id);
-		rdebug_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
+		log_request_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
 
 		request->component = "radius";
 
@@ -522,7 +522,7 @@ static fr_io_final_t mod_process(REQUEST *request, fr_io_action_t action)
 		 */
 		if (request->parent) {
 			RDEBUG("Sent %s ID %i", fr_packet_codes[request->reply->code], request->reply->id);
-			rdebug_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
+			log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
 			return FR_IO_REPLY;
 		}
 

diff --git a/src/modules/proto_radius/proto_radius_coa.c b/src/modules/proto_radius/proto_radius_coa.c
@@ -51,7 +51,7 @@ static fr_io_final_t mod_process(REQUEST *request, fr_io_action_t action)
 	switch (request->request_state) {
 	case REQUEST_INIT:
 		RDEBUG("Received %s ID %i", fr_packet_codes[request->packet->code], request->packet->id);
-		rdebug_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
+		log_request_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
 
 		request->component = "radius";
 
@@ -208,7 +208,7 @@ static fr_io_final_t mod_process(REQUEST *request, fr_io_action_t action)
 		 */
 		if (request->parent) {
 			RDEBUG("Sent %s ID %i", fr_packet_codes[request->reply->code], request->reply->id);
-			rdebug_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
+			log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
 			return FR_IO_DONE;
 		}
 

diff --git a/src/modules/proto_radius/proto_radius_dynamic_client.c b/src/modules/proto_radius/proto_radius_dynamic_client.c
@@ -48,7 +48,7 @@ static fr_io_final_t mod_process(REQUEST *request, fr_io_action_t action)
 	switch (request->request_state) {
 	case REQUEST_INIT:
 		RDEBUG("Received %s ID %i", fr_packet_codes[request->packet->code], request->packet->id);
-		rdebug_proto_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
+		log_request_proto_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
 
 		request->component = "radius";
 
@@ -169,7 +169,7 @@ static fr_io_final_t mod_process(REQUEST *request, fr_io_action_t action)
 		} else {
 			RDEBUG("Denying client");
 		}
-		if (RDEBUG_ENABLED) rdebug_pair_list(L_DBG_LVL_1, request, request->reply->vps, NULL);
+		if (RDEBUG_ENABLED) log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, NULL);
 		break;
 
 	default:

diff --git a/src/modules/proto_radius/proto_radius_status.c b/src/modules/proto_radius/proto_radius_status.c
@@ -51,7 +51,7 @@ static fr_io_final_t mod_process(REQUEST *request, fr_io_action_t action)
 	switch (request->request_state) {
 	case REQUEST_INIT:
 		RDEBUG("Received %s ID %i", fr_packet_codes[request->packet->code], request->packet->id);
-		rdebug_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
+		log_request_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
 
 		request->component = "radius";
 
@@ -173,7 +173,7 @@ static fr_io_final_t mod_process(REQUEST *request, fr_io_action_t action)
 		 */
 		if (request->parent) {
 			RDEBUG("Sent %s ID %i", fr_packet_codes[request->reply->code], request->reply->id);
-			rdebug_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
+			log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
 			return FR_IO_DONE;
 		}
 

diff --git a/src/modules/proto_tacacs/proto_tacacs.c b/src/modules/proto_tacacs/proto_tacacs.c
@@ -56,7 +56,7 @@ static void tacacs_packet_debug(REQUEST *request, RADIUS_PACKET *packet, bool re
 	       packet->dst_port,
 	       packet->data_len);
 
-	rdebug_pair_list(L_DBG_LVL_1, request, packet->vps, NULL);
+	log_request_pair_list(L_DBG_LVL_1, request, packet->vps, NULL);
 }
 
 static void tacacs_status(REQUEST * const request, rlm_rcode_t rcode)

diff --git a/src/modules/proto_vmps/proto_vmps_all.c b/src/modules/proto_vmps/proto_vmps_all.c
@@ -43,7 +43,7 @@ static fr_io_final_t mod_process(REQUEST *request, UNUSED fr_io_action_t action)
 	case REQUEST_INIT:
 		log_request(L_DBG, L_DBG_LVL_1, request, "Received %s ID %08x",
 			       fr_vmps_codes[request->packet->code], request->packet->id);
-		rdebug_proto_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
+		log_request_proto_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
 
 		request->component = "vmps";
 

diff --git a/src/modules/proto_vmps/proto_vmps_dynamic_client.c b/src/modules/proto_vmps/proto_vmps_dynamic_client.c
@@ -52,7 +52,7 @@ static fr_io_final_t mod_process(REQUEST *request, fr_io_action_t action)
 	switch (request->request_state) {
 	case REQUEST_INIT:
 		RDEBUG("Received %s ID %i", fr_vmps_codes[request->packet->code], request->packet->id);
-		rdebug_proto_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
+		log_request_proto_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
 
 		request->component = "vmps";
 
@@ -163,7 +163,7 @@ static fr_io_final_t mod_process(REQUEST *request, fr_io_action_t action)
 		} else {
 			RDEBUG("Denying client");
 		}
-		if (RDEBUG_ENABLED) rdebug_pair_list(L_DBG_LVL_1, request, request->reply->vps, NULL);
+		if (RDEBUG_ENABLED) log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, NULL);
 		break;
 
 	default:

diff --git a/src/modules/rlm_eap/lib/base/eap_chbind.c b/src/modules/rlm_eap/lib/base/eap_chbind.c
@@ -78,7 +78,7 @@ static bool chbind_build_response(REQUEST *request, CHBIND_REQ *chbind)
 	ptr[3] = CHBIND_NSID_RADIUS;
 
 	RDEBUG("Sending chbind response: code %i", (int )(ptr[0]));
-	rdebug_pair_list(L_DBG_LVL_1, request, request->reply->vps, NULL);
+	log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, NULL);
 
 	/* Encode the chbind attributes into the response */
 	ptr += 4;