From 7f26675d200084a3ecd1c0352a4181e466b2c8a1 Mon Sep 17 00:00:00 2001 From: Arran Cudbard-Bell Date: Wed, 16 May 2018 14:53:25 +0600 Subject: [PATCH] Move pair list logging functions into log.c --- src/include/log.h | 4 ++ src/include/radiusd.h | 4 +- src/lib/tls/validate.c | 2 +- src/main/auth.c | 8 +-- src/main/log.c | 57 ++++++++++++++++++- src/main/pair.c | 53 ----------------- src/main/state.c | 4 +- .../proto_detail/proto_detail_process.c | 4 +- src/modules/proto_dhcpv4/old.c | 4 +- src/modules/proto_dhcpv4/proto_dhcpv4_all.c | 2 +- src/modules/proto_ldap_sync/proto_ldap_sync.c | 2 +- src/modules/proto_radius/proto_radius_acct.c | 4 +- src/modules/proto_radius/proto_radius_auth.c | 4 +- src/modules/proto_radius/proto_radius_coa.c | 4 +- .../proto_radius_dynamic_client.c | 4 +- .../proto_radius/proto_radius_status.c | 4 +- src/modules/proto_tacacs/proto_tacacs.c | 2 +- src/modules/proto_vmps/proto_vmps_all.c | 2 +- .../proto_vmps/proto_vmps_dynamic_client.c | 4 +- src/modules/rlm_eap/lib/base/eap_chbind.c | 2 +- .../rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c | 4 +- .../rlm_eap/types/rlm_eap_fast/eap_fast.c | 4 +- .../types/rlm_eap_mschapv2/rlm_eap_mschapv2.c | 2 +- src/modules/rlm_eap/types/rlm_eap_peap/peap.c | 6 +- .../rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c | 4 +- src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c | 6 +- src/modules/rlm_radius/rlm_radius_udp.c | 10 ++-- src/modules/rlm_rest/rest.c | 2 +- src/modules/rlm_sql/rlm_sql.c | 4 +- 29 files changed, 110 insertions(+), 106 deletions(-) diff --git a/src/include/log.h b/src/include/log.h index 22d75bd519b3..dac16668fdfa 100644 --- 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 index 5ecc8a017418..893facdfb193 100644 --- 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 index 989427e5c824..3b9b87058640 100644 --- 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 index 51274f9a3aec..7aaef584db63 100644 --- 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 index d251e759c9d8..92d5b26475da 100644 --- 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 index ca87e5f41fc4..c9406844e0d7 100644 --- 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 index 099c5c244f68..4020eec27889 100644 --- 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 index f3cfba069885..07dc79384d08 100644 --- 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 index 288107bb969e..a632285ec30d 100644 --- 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 index 593d8f148f2c..7acd71111894 100644 --- 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 index 3bf5ddc4e1fa..33ab464be920 100644 --- 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 index 6727c2f53f2e..1ecae16e5a12 100644 --- 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 index 44e4cb3b0e6c..aba43d94cda0 100644 --- 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 index d383fa8e9374..b3809f334558 100644 --- 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 index 256e625ebfc5..2fcca0a93336 100644 --- 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 index 4363dd1c550c..6423ab33a7a0 100644 --- 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 index baddcdd790ee..0b3d0319010d 100644 --- 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 index 0ae598ba2845..9c67a2c16460 100644 --- 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 index f9918e179b16..533e1ef2fa4e 100644 --- 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 index 63104036f14e..389c8bd4adf0 100644 --- 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; diff --git a/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c b/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c index 0555a79eeac4..382db416c9b8 100644 --- a/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c +++ b/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c @@ -170,7 +170,7 @@ static int eap_aka_compose(eap_session_t *eap_session) } RDEBUG2("Encoding EAP-AKA attributes"); - rdebug_pair_list(L_DBG_LVL_2, request, head, NULL); + log_request_pair_list(L_DBG_LVL_2, request, head, NULL); eap_session->this_round->request->type.num = eap_aka_session->type; eap_session->this_round->request->id = eap_aka_session->aka_id++ & 0xff; @@ -919,7 +919,7 @@ static rlm_rcode_t mod_process(UNUSED void *arg, eap_session_t *eap_session) vp = fr_cursor_current(&cursor); if (vp && RDEBUG_ENABLED2) { RDEBUG2("EAP-AKA decoded attributes"); - rdebug_pair_list(L_DBG_LVL_2, request, vp, NULL); + log_request_pair_list(L_DBG_LVL_2, request, vp, NULL); } subtype_vp = fr_pair_find_by_da(vps, attr_eap_aka_subtype, TAG_ANY); diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c index 2186d90341a9..33685f40b057 100644 --- a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c +++ b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c @@ -583,7 +583,7 @@ static FR_CODE eap_fast_eap_payload(REQUEST *request, eap_session_t *eap_session fr_pair_value_memcpy(fake->packet->vps, tlv_eap_payload->vp_octets, tlv_eap_payload->vp_length); RDEBUG("Got tunneled request"); - rdebug_pair_list(L_DBG_LVL_1, request, fake->packet->vps, NULL); + log_request_pair_list(L_DBG_LVL_1, request, fake->packet->vps, NULL); /* * Tell the request that it's a fake one. @@ -960,7 +960,7 @@ FR_CODE eap_fast_process(eap_session_t *eap_session, tls_session_t *tls_session) data, data_len, NULL) < 0) return FR_CODE_ACCESS_REJECT; RDEBUG("Got Tunneled FAST TLVs"); - rdebug_pair_list(L_DBG_LVL_1, request, fast_vps, NULL); + log_request_pair_list(L_DBG_LVL_1, request, fast_vps, NULL); code = eap_fast_process_tlvs(request, eap_session, tls_session, fast_vps); fr_pair_list_free(&fast_vps); diff --git a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c index c051fd843733..4facab34c61e 100644 --- a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c +++ b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c @@ -505,7 +505,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_process(void *arg, eap_session_t *eap_se } RDEBUG2("Built change password packet"); - rdebug_pair_list(L_DBG_LVL_2, request, request->packet->vps, NULL); + log_request_pair_list(L_DBG_LVL_2, request, request->packet->vps, NULL); /* * jump to "authentication" diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c index b13ebabe4960..244e104b9bb9 100644 --- a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c +++ b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c @@ -397,7 +397,7 @@ static rlm_rcode_t CC_HINT(nonnull) process_reply(eap_session_t *eap_session, tl } else { RDEBUG2("Got tunneled reply code %i", reply->code); } - rdebug_pair_list(L_DBG_LVL_2, request, reply->vps, NULL); + log_request_pair_list(L_DBG_LVL_2, request, reply->vps, NULL); } switch (reply->code) { @@ -509,7 +509,7 @@ static int CC_HINT(nonnull) eap_peap_postproxy(eap_session_t *eap_session, void fprintf(fr_log_fp, "} # server %s\n", cf_section_name2(fake->server_cs)); RDEBUG("Final reply from tunneled session code %d", fake->reply->code); - rdebug_pair_list(L_DBG_LVL_1, request, fake->reply->vps, NULL); + log_request_pair_list(L_DBG_LVL_1, request, fake->reply->vps, NULL); } /* @@ -859,7 +859,7 @@ rlm_rcode_t eap_peap_process(eap_session_t *eap_session, tls_session_t *tls_sess } RDEBUG2("Got tunneled request"); - rdebug_pair_list(L_DBG_LVL_2, request, fake->packet->vps, NULL); + log_request_pair_list(L_DBG_LVL_2, request, fake->packet->vps, NULL); /* * Update other items in the REQUEST data structure. diff --git a/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c b/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c index 6efcd83b0e71..2df308dfda27 100644 --- a/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c +++ b/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c @@ -174,7 +174,7 @@ static int eap_sim_compose(eap_session_t *eap_session, uint8_t const *hmac_extra } RDEBUG2("Encoding EAP-SIM attributes"); - rdebug_pair_list(L_DBG_LVL_2, request, head, NULL); + log_request_pair_list(L_DBG_LVL_2, request, head, NULL); eap_session->this_round->request->type.num = FR_EAP_SIM; eap_session->this_round->request->id = eap_sim_session->sim_id++ & 0xff; @@ -908,7 +908,7 @@ static rlm_rcode_t mod_process(UNUSED void *arg, eap_session_t *eap_session) vp = fr_cursor_current(&cursor); if (vp && RDEBUG_ENABLED2) { RDEBUG2("Decoded EAP-SIM attributes"); - rdebug_pair_list(L_DBG_LVL_2, request, vp, NULL); + log_request_pair_list(L_DBG_LVL_2, request, vp, NULL); } subtype_vp = fr_pair_find_by_da(from_peer, attr_eap_sim_subtype, TAG_ANY); diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c index 2888885a29ef..1f6ec4a1a3cb 100644 --- a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c +++ b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c @@ -555,7 +555,7 @@ static rlm_rcode_t CC_HINT(nonnull) process_reply(NDEBUG_UNUSED eap_session_t *e */ if (tunnel_vps) { RDEBUG("Sending tunneled reply attributes"); - rdebug_pair_list(L_DBG_LVL_2, request, tunnel_vps, NULL); + log_request_pair_list(L_DBG_LVL_2, request, tunnel_vps, NULL); vp2diameter(request, tls_session, tunnel_vps); fr_pair_list_free(&tunnel_vps); @@ -617,7 +617,7 @@ static int CC_HINT(nonnull) eap_ttls_postproxy(eap_session_t *eap_session, void fprintf(fr_log_fp, "} # server %s\n", cf_section_name2(fake->server_cs)); RDEBUG("Final reply from tunneled session code %d", fake->reply->code); - rdebug_pair_list(L_DBG_LVL_1, request, fake->reply->vps, NULL); + log_request_pair_list(L_DBG_LVL_1, request, fake->reply->vps, NULL); } /* @@ -765,7 +765,7 @@ FR_CODE eap_ttls_process(eap_session_t *eap_session, tls_session_t *tls_session) fr_pair_value_from_str(vp, "127.0.0.1", sizeof("127.0.0.1")); RDEBUG("Got tunneled request"); - rdebug_pair_list(L_DBG_LVL_1, request, fake->packet->vps, NULL); + log_request_pair_list(L_DBG_LVL_1, request, fake->packet->vps, NULL); /* * Update other items in the REQUEST data structure. diff --git a/src/modules/rlm_radius/rlm_radius_udp.c b/src/modules/rlm_radius/rlm_radius_udp.c index 3532e7c887a3..5a5ee4cce124 100644 --- a/src/modules/rlm_radius/rlm_radius_udp.c +++ b/src/modules/rlm_radius/rlm_radius_udp.c @@ -1040,7 +1040,7 @@ static void conn_read(fr_event_list_t *el, int fd, UNUSED int flags, void *uctx) RDEBUG("Received %s ID %d length %ld reply packet on connection %s", fr_packet_codes[code], code, packet_len, c->name); - rdebug_pair_list(L_DBG_LVL_2, request, vp, NULL); + log_request_pair_list(L_DBG_LVL_2, request, vp, NULL); /* * @todo - make this programmatic? i.e. run a @@ -1203,8 +1203,8 @@ static int retransmit_packet(rlm_radius_udp_request_t *u, struct timeval *now) RDEBUG("%s %s ID %d length %ld over connection %s", (c->status_u != u) ? "sending" : "status_check", fr_packet_codes[u->code], u->rr->id, u->packet_len, c->name); - rdebug_pair_list(L_DBG_LVL_2, request, request->packet->vps, NULL); - if (u->extra) rdebug_pair_list(L_DBG_LVL_2, request, u->extra, NULL); + log_request_pair_list(L_DBG_LVL_2, request, request->packet->vps, NULL); + if (u->extra) log_request_pair_list(L_DBG_LVL_2, request, u->extra, NULL); if (u->manual_delay_time && u->acct_delay_time) { uint32_t delay; @@ -1450,7 +1450,7 @@ static int conn_write(rlm_radius_udp_connection_t *c, rlm_radius_udp_request_t * RDEBUG("Sending %s ID %d length %ld over connection %s", fr_packet_codes[u->code], u->rr->id, packet_len, c->name); - rdebug_pair_list(L_DBG_LVL_2, request, request->packet->vps, NULL); + log_request_pair_list(L_DBG_LVL_2, request, request->packet->vps, NULL); /* * Might have been sent and then given up on... free the @@ -2098,7 +2098,7 @@ static fr_connection_state_t _conn_open(UNUSED fr_event_list_t *el, UNUSED int f } DEBUG3("Status check packet will be %s", fr_packet_codes[u->code]); - rdebug_pair_list(L_DBG_LVL_3, request, request->packet->vps, NULL); + log_request_pair_list(L_DBG_LVL_3, request, request->packet->vps, NULL); /* * Initialize the link. Note that we don't set diff --git a/src/modules/rlm_rest/rest.c b/src/modules/rlm_rest/rest.c index 26f428714364..277c3c2101f5 100644 --- a/src/modules/rlm_rest/rest.c +++ b/src/modules/rlm_rest/rest.c @@ -2140,7 +2140,7 @@ int rest_response_certinfo(UNUSED rlm_rest_t const *instance, UNUSED rlm_rest_se /* * Print out all the pairs we have so far */ - rdebug_pair_list(L_DBG_LVL_2, request, cert_vps, NULL); + log_request_pair_list(L_DBG_LVL_2, request, cert_vps, NULL); fr_pair_cursor_merge(&list, cert_vps); cert_vps = NULL; } diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c index f218342842e1..4c6e0b3adced 100644 --- a/src/modules/rlm_sql/rlm_sql.c +++ b/src/modules/rlm_sql/rlm_sql.c @@ -929,7 +929,7 @@ static rlm_rcode_t rlm_sql_process_groups(rlm_sql_t const *inst, REQUEST *reques RDEBUG2("Group \"%s\": Merging reply items", entry->name); if (rcode == RLM_MODULE_NOOP) rcode = RLM_MODULE_UPDATED; - rdebug_pair_list(L_DBG_LVL_2, request, reply_tmp, NULL); + log_request_pair_list(L_DBG_LVL_2, request, reply_tmp, NULL); radius_pairmove(request, &request->reply->vps, reply_tmp, true); reply_tmp = NULL; @@ -1297,7 +1297,7 @@ static rlm_rcode_t mod_authorize(void *instance, UNUSED void *thread, REQUEST *r RDEBUG2("User found in radreply table, merging reply items"); user_found = true; - rdebug_pair_list(L_DBG_LVL_2, request, reply_tmp, NULL); + log_request_pair_list(L_DBG_LVL_2, request, reply_tmp, NULL); radius_pairmove(request, &request->reply->vps, reply_tmp, true);