Move pair list logging functions into log.c

diff --git a/src/include/log.h b/src/include/log.h
index 22d75bd519b3a9d799de76104cd0486ac7051df0..dac16668fdfa3d0f8b1225314a65fba9cc3887c6 100644 (file)
--- 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 5ecc8a0174187e3547d641c4c489ee6168a593f7..893facdfb1930ef6e217ac2a25fd2448619b6dfb 100644 (file)
--- 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 989427e5c8249c58c24f3002ef208bc785424f06..3b9b8705864015e0c5ffe40337fd3432889691b5 100644 (file)
--- 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 51274f9a3aec66cffb37d7e817c4936b434c90fc..7aaef584db63c2e22fd723e3bda615e9cd022cc9 100644 (file)
--- 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 @@ skip:
        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 d251e759c9d8cea575b140bea9a080771da01cf7..92d5b26475daf729a292386c99c81472c0ad7c43 100644 (file)
--- 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 ca87e5f41fc4299eac5cbdb5cd7f7d141917f7bf..c9406844e0d76b8f9f1eff283adc1345b83326fb 100644 (file)
--- 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 099c5c244f680a9f17a04acb9246202f1957c1ae..4020eec27889155f1d00dbbcfd52bcec63b7df19 100644 (file)
--- 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 f3cfba06988528eed92d63a9d996e2632e6f3940..07dc79384d08cc7d1486178b9563039449618575 100644 (file)
--- 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 288107bb969e55253fbb45e09f87c8fceb441b9b..a632285ec30d36a5cb80ca74751aee108c8cb43d 100644 (file)
--- 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 593d8f148f2c6da41bdd6ce4fe3bbb838737002e..7acd7111189408ab4a253e62d51c5e751fab5945 100644 (file)
--- 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 3bf5ddc4e1fa794f35eeb6c619828cf90221000c..33ab464be9208e3dbeba60147358b9f6014640b6 100644 (file)
--- 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 6727c2f53f2ee3c33c005e2c593f15c300854f44..1ecae16e5a128c5e7315224b2fc34d86ee11aa47 100644 (file)
--- 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 44e4cb3b0e6cfdbc828d03c9c7ec8dc3dba4fbf2..aba43d94cda0429a869fb6ab95b95449a34df1c2 100644 (file)
--- 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 d383fa8e9374c796670cef0221445b7a9f1c6346..b3809f3345589043f752c522cebdd86d28b25663 100644 (file)
--- 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 256e625ebfc5f483d2f72f0109eb709338f493a6..2fcca0a93336ff35b5e6a5cf9f7e899f22d4ad3a 100644 (file)
--- 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 4363dd1c550c4238e46d1d688993ffa3d31cd7a1..6423ab33a7a0c7c8416216e6f2f7800600cae234 100644 (file)
--- 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 baddcdd790eef1cec23737ff37498125b33c9ee9..0b3d0319010d4b8f863c5200d009eefcec90168a 100644 (file)
--- 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 0ae598ba28452df71f5f3aedb009edd1067d7eda..9c67a2c16460c16e166bc28d132064de03051431 100644 (file)
--- 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 f9918e179b1653b7a0a29e3661b6866a2215c4c5..533e1ef2fa4ef453a44b2778a7a5ffb9e181b1f1 100644 (file)
--- 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 63104036f14e13f9cf69ccad23393518365b11dc..389c8bd4adf047b476236118bed5304d32af1b0c 100644 (file)
--- 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 0555a79eeac42672619e873b563fc216757c99d9..382db416c9b8a5c5e76e6a6f0b875993d5cde35d 100644 (file)
--- 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 2186d90341a9c5914a5f69bc117fb72e8f08cef5..33685f40b057d61c71bef774ce39701f58b09956 100644 (file)
--- 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 c051fd843733d49dc22ff1915f757d46d833a4d9..4facab34c61ee747719b46192ee90637ddbf18fa 100644 (file)
--- 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 b13ebabe4960730807f52314746293fa22bd4b81..244e104b9bb9c601d52b261fcbd942ec7d3cd6c8 100644 (file)
--- 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 6efcd83b0e7184f3c99fbbebb77c7279ed8a9823..2df308dfda2714eec987142de011875a593de114 100644 (file)
--- 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 2888885a29efd31152b4a947a9743e5bb759245c..1f6ec4a1a3cb2c407a7aad7ddf371f4049dd3d49 100644 (file)
--- 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 3532e7c887a34c29440e9c2c3e50af1915fedbba..5a5ee4cce12413fd9418d8b2175a6290fe7d524e 100644 (file)
--- a/src/modules/rlm_radius/rlm_radius_udp.c
+++ b/src/modules/rlm_radius/rlm_radius_udp.c
@@ -1040,7 +1040,7 @@ check_active:
 
                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 26f42871436429c7a1bbd15438a02b075a5e4df5..277c3c2101f5dcbb271282f16fe6fc9bfd9a1e45 100644 (file)
--- 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 f218342842e19ace480920d7ace510558992eabb..4c6e0b3adcedf81aba4952d8edfe5f8a9f82fa60 100644 (file)
--- 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);