clean up and regularize the debug output

diff --git a/src/modules/proto_radius/proto_radius.c b/src/modules/proto_radius/proto_radius.c
index 68e9cf4be785b15e43204c25e91cd6322a75f61f..fde92a9cdafd7868823d0450493e50f67c81db6f 100644 (file)
--- a/src/modules/proto_radius/proto_radius.c
+++ b/src/modules/proto_radius/proto_radius.c
@@ -425,6 +425,15 @@ static ssize_t mod_encode(void const *instance, REQUEST *request, uint8_t *buffe
 
                rad_assert(buffer_len >= sizeof(client));
 
+               /*
+                *      We don't accept the new client, so don't do
+                *      anything.
+                */
+               if (request->reply->code != FR_CODE_ACCESS_ACCEPT) {
+                       *buffer = true;
+                       return 1;
+               }
+
                /*
                 *      Allocate the client.  If that fails, send back a NAK.
                 *
@@ -438,7 +447,7 @@ static ssize_t mod_encode(void const *instance, REQUEST *request, uint8_t *buffe
                new_client = client_afrom_request(NULL, request);
                if (!new_client) {
                        PERROR("Failed creating new client");
-                       buffer[0] = true;
+                       *buffer = true;
                        return 1;
                }
 

diff --git a/src/modules/proto_radius/proto_radius_acct.c b/src/modules/proto_radius/proto_radius_acct.c
index b59d1b14149e5ed5442896f2e4a3e93a44288dd9..f72bffdbdaf56c54c0ed7da03450fccbabffe6a4 100644 (file)
--- a/src/modules/proto_radius/proto_radius_acct.c
+++ b/src/modules/proto_radius/proto_radius_acct.c
@@ -27,7 +27,6 @@
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dict.h>
-#include <freeradius-devel/server/state.h>
 #include <freeradius-devel/server/rad_assert.h>
 
 static fr_dict_t *dict_freeradius;
@@ -66,8 +65,10 @@ static fr_io_final_t mod_process(UNUSED void const *instance, REQUEST *request,
 
        switch (request->request_state) {
        case REQUEST_INIT:
-               RDEBUG("Received %s ID %i", fr_packet_codes[request->packet->code], request->packet->id);
-               log_request_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
+               if (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, request->packet->vps, "");
+               }
 
                request->component = "radius";
 
@@ -157,24 +158,20 @@ static fr_io_final_t mod_process(UNUSED void const *instance, REQUEST *request,
                }
 
        send_reply:
+               gettimeofday(&request->reply->timestamp, NULL);
+
                /*
                 *      Check for "do not respond".
                 */
                if (request->reply->code == FR_CODE_DO_NOT_RESPOND) {
                        RDEBUG("Not sending reply to client.");
-                       return FR_IO_DONE;
+                       break;
                }
 
-               /*
-                *      This is an internally generated request.  Don't print IP addresses.
-                */
-               if (request->parent) {
-                       RDEBUG("Sent %s ID %i", fr_packet_codes[request->reply->code], request->reply->id);
+               if (RDEBUG_ENABLED) {
+                       RDEBUG("Sending %s ID %i", fr_packet_codes[request->reply->code], request->reply->id);
                        log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
-                       return FR_IO_DONE;
                }
-
-               if (RDEBUG_ENABLED) common_packet_debug(request, request->reply, false);
                break;
 
        default:

diff --git a/src/modules/proto_radius/proto_radius_auth.c b/src/modules/proto_radius/proto_radius_auth.c
index 3a9ea2a12c4e85df7dbf77e406c30444bc68ebc1..5c103043e9486fa11f909829228ab85d9829a2a9 100644 (file)
--- a/src/modules/proto_radius/proto_radius_auth.c
+++ b/src/modules/proto_radius/proto_radius_auth.c
@@ -261,8 +261,10 @@ static fr_io_final_t mod_process(void const *instance, REQUEST *request, fr_io_a
 
        switch (request->request_state) {
        case REQUEST_INIT:
-               RDEBUG("Received %s ID %i", fr_packet_codes[request->packet->code], request->packet->id);
-               log_request_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
+               if (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, request->packet->vps, "");
+               }
 
                request->component = "radius";
 
@@ -612,20 +614,13 @@ static fr_io_final_t mod_process(void const *instance, REQUEST *request, fr_io_a
                 */
                if (request->reply->code == FR_CODE_DO_NOT_RESPOND) {
                        RDEBUG("Not sending reply to client.");
-                       return FR_IO_REPLY;
+                       break;
                }
 
-               /*
-                *      This is an internally generated request.
-                *      Don't print IP addresses.
-                */
-               if (request->parent) {
-                       RDEBUG("Sent %s ID %i", fr_packet_codes[request->reply->code], request->reply->id);
+               if (RDEBUG_ENABLED) {
+                       RDEBUG("Sending %s ID %i", fr_packet_codes[request->reply->code], request->reply->id);
                        log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
-                       return FR_IO_REPLY;
                }
-
-               if (RDEBUG_ENABLED) common_packet_debug(request, request->reply, false);
                break;
 
        default:

diff --git a/src/modules/proto_radius/proto_radius_coa.c b/src/modules/proto_radius/proto_radius_coa.c
index 330ac7118514fefa9d28392ac078db64bf66ec1a..74850ab5f014ec2fe6bde608ec807426a10857dd 100644 (file)
--- a/src/modules/proto_radius/proto_radius_coa.c
+++ b/src/modules/proto_radius/proto_radius_coa.c
@@ -65,8 +65,10 @@ static fr_io_final_t mod_process(UNUSED void const *instance, REQUEST *request,
 
        switch (request->request_state) {
        case REQUEST_INIT:
-               RDEBUG("Received %s ID %i", fr_packet_codes[request->packet->code], request->packet->id);
-               log_request_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
+               if (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, request->packet->vps, "");
+               }
 
                request->component = "radius";
 
@@ -202,24 +204,20 @@ static fr_io_final_t mod_process(UNUSED void const *instance, REQUEST *request,
                }
 
        send_reply:
+               gettimeofday(&request->reply->timestamp, NULL);
+
                /*
                 *      Check for "do not respond".
                 */
                if (request->reply->code == FR_CODE_DO_NOT_RESPOND) {
                        RDEBUG("Not sending reply to client.");
-                       return FR_IO_DONE;
+                       break;
                }
 
-               /*
-                *      This is an internally generated request.  Don't print IP addresses.
-                */
-               if (request->parent) {
-                       RDEBUG("Sent %s ID %i", fr_packet_codes[request->reply->code], request->reply->id);
+               if (RDEBUG_ENABLED) {
+                       RDEBUG("Sending %s ID %i", fr_packet_codes[request->reply->code], request->reply->id);
                        log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
-                       return FR_IO_DONE;
                }
-
-               if (RDEBUG_ENABLED) common_packet_debug(request, request->reply, false);
                break;
 
        default:

diff --git a/src/modules/proto_radius/proto_radius_dynamic_client.c b/src/modules/proto_radius/proto_radius_dynamic_client.c
index 0f42b99c7342cb8ec72f3cf8c6f56df3a4e221e5..81bf28556427effbd31dc2f1441e1efd86cfcabc 100644 (file)
--- a/src/modules/proto_radius/proto_radius_dynamic_client.c
+++ b/src/modules/proto_radius/proto_radius_dynamic_client.c
@@ -27,6 +27,7 @@
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dict.h>
+#include <freeradius-devel/io/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 
 static fr_dict_t *dict_freeradius;
@@ -71,8 +72,10 @@ static fr_io_final_t mod_process(UNUSED void const *instance, REQUEST *request,
 
        switch (request->request_state) {
        case REQUEST_INIT:
-               RDEBUG("Received %s ID %i", fr_packet_codes[request->packet->code], request->packet->id);
-               log_request_proto_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
+               if (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, request->packet->vps, "");
+               }
 
                request->component = "radius";
 
@@ -193,7 +196,6 @@ static fr_io_final_t mod_process(UNUSED void const *instance, REQUEST *request,
                } else {
                        RDEBUG("Denying client");
                }
-               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 18d4690583d34991d1fa81ebea83a08b83f3feae..80f023cf6e06fe8d6b40d1e34cdee12bcb42b1a8 100644 (file)
--- a/src/modules/proto_radius/proto_radius_status.c
+++ b/src/modules/proto_radius/proto_radius_status.c
@@ -65,8 +65,10 @@ static fr_io_final_t mod_process(UNUSED void const *instance, REQUEST *request,
 
        switch (request->request_state) {
        case REQUEST_INIT:
-               RDEBUG("Received %s ID %i", fr_packet_codes[request->packet->code], request->packet->id);
-               log_request_pair_list(L_DBG_LVL_1, request, request->packet->vps, "");
+               if (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, request->packet->vps, "");
+               }
 
                request->component = "radius";
 
@@ -169,24 +171,20 @@ static fr_io_final_t mod_process(UNUSED void const *instance, REQUEST *request,
                }
 
        send_reply:
+               gettimeofday(&request->reply->timestamp, NULL);
+
                /*
                 *      Check for "do not respond".
                 */
                if (request->reply->code == FR_CODE_DO_NOT_RESPOND) {
                        RDEBUG("Not sending reply to client.");
-                       return FR_IO_DONE;
+                       break;
                }
 
-               /*
-                *      This is an internally generated request.  Don't print IP addresses.
-                */
-               if (request->parent) {
-                       RDEBUG("Sent %s ID %i", fr_packet_codes[request->reply->code], request->reply->id);
+               if (RDEBUG_ENABLED) {
+                       RDEBUG("Sending %s ID %i", fr_packet_codes[request->reply->code], request->reply->id);
                        log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
-                       return FR_IO_DONE;
                }
-
-               if (RDEBUG_ENABLED) common_packet_debug(request, request->reply, false);
                break;
 
        default: