Use RINDENT REXDENT in more places

diff --git a/src/main/command.c b/src/main/command.c
index 340fdbb..c35cec9 100644 (file)
--- a/src/main/command.c
+++ b/src/main/command.c
@@ -1135,15 +1135,15 @@ static int null_socket_send(UNUSED rad_listen_t *listener, REQUEST *request)
                                         request->reply->code, request->reply->id);
                }
 
+               RINDENT();
                for (vp = fr_cursor_init(&cursor, &request->reply->vps);
                     vp;
                     vp = fr_cursor_next(&cursor)) {
                        vp_prints(buffer, sizeof(buffer), vp);
                        fprintf(fp, "%s\n", buffer);
-                       if (debug_flag) {
-                               RDEBUG("\t%s", buffer);
-                       }
+                       RDEBUG("%s", buffer);
                }
+               REXDENT();
        }
        fclose(fp);
 

diff --git a/src/main/process.c b/src/main/process.c
index 77d1458..981c8e4 100644 (file)
--- a/src/main/process.c
+++ b/src/main/process.c
@@ -403,12 +403,14 @@ static void debug_packet(REQUEST *request, RADIUS_PACKET *packet, int direction)
                       packet->code, packet->id, packet->data_len);
        }
 
+       RINDENT();
        for (vp = fr_cursor_init(&cursor, &packet->vps);
             vp;
             vp = fr_cursor_next(&cursor)) {
                vp_prints(buffer, sizeof(buffer), vp);
-               RDEBUG("\t%s", buffer);
+               RDEBUG("%s", buffer);
        }
+       REXDENT();
 }
 
 

diff --git a/src/main/xlat.c b/src/main/xlat.c
index 193e3f3..a344ab5 100644 (file)
--- a/src/main/xlat.c
+++ b/src/main/xlat.c
@@ -323,31 +323,35 @@ static ssize_t xlat_debug_attr(UNUSED void *instance, REQUEST *request, char con
 
                vp_prints_value(buffer, sizeof(buffer), vp, '\'');
 
+               RINDENT();
                if (vp->da->flags.has_tag) {
-                       RIDEBUG2("\t%s:%s:%i %s %s",
+                       RIDEBUG2("%s:%s:%i %s %s",
                                fr_int2str(pair_lists, vpt.tmpl_list, "<INVALID>"),
                                vp->da->name,
                                vp->tag,
                                fr_int2str(fr_tokens, vp->op, "<INVALID>"),
                                buffer);
                } else {
-                       RIDEBUG2("\t%s:%s %s %s",
+                       RIDEBUG2("%s:%s %s %s",
                                fr_int2str(pair_lists, vpt.tmpl_list, "<INVALID>"),
                                vp->da->name,
                                fr_int2str(fr_tokens, vp->op, "<INVALID>"),
                                buffer);
                }
+               REXDENT();
 
-               if (!RDEBUG_ENABLED3) {
-                       goto next_vp;
-               }
+               if (!RDEBUG_ENABLED3) goto next_vp;
 
+               RINDENT();
+               RINDENT();
                if (vp->da->vendor) {
                        dv = dict_vendorbyvalue(vp->da->vendor);
-                       RDEBUG3("\t\tvendor        : %i (%s)", vp->da->vendor, dv ? dv->name : "unknown");
+                       RDEBUG3("Vendor : %i (%s)", vp->da->vendor, dv ? dv->name : "unknown");
                }
-               RDEBUG3("\t\ttype          : %s", fr_int2str(dict_attr_types, vp->da->type, "<INVALID>"));
-               RDEBUG3("\t\tlength        : %zu", vp->length);
+               RDEBUG3("Type   : %s", fr_int2str(dict_attr_types, vp->da->type, "<INVALID>"));
+               RDEBUG3("Length : %zu", vp->length);
+               REXDENT();
+               REXDENT();
 
                dac = talloc_memdup(request, vp->da, sizeof(DICT_ATTR));
                if (!dac) return -1;

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 441ca4f..26a87ae 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
@@ -173,23 +173,25 @@ static int eap_sim_get_challenge(eap_handler_t *handler, VALUE_PAIR *vps, int id
 
                        RDEBUG2("Generated following triplets for round %i:", idx);
 
+                       RINDENT();
                        p = buffer;
                        for (i = 0; i < EAPSIM_RAND_SIZE; i++) {
                                p += sprintf(p, "%02x", ess->keys.rand[idx][i]);
                        }
-                       RDEBUG2("\tRAND : 0x%s", buffer);
+                       RDEBUG2("RAND : 0x%s", buffer);
 
                        p = buffer;
                        for (i = 0; i < EAPSIM_SRES_SIZE; i++) {
                                p += sprintf(p, "%02x", ess->keys.sres[idx][i]);
                        }
-                       RDEBUG2("\tSRES : 0x%s", buffer);
+                       RDEBUG2("SRES : 0x%s", buffer);
 
                        p = buffer;
                        for (i = 0; i < EAPSIM_KC_SIZE; i++) {
                                p += sprintf(p, "%02x", ess->keys.Kc[idx][i]);
                        }
-                       RDEBUG2("\tKc   : 0x%s", buffer);
+                       RDEBUG2("Kc   : 0x%s", buffer);
+                       REXDENT();
                }
                return 1;
        }