]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
don't call decode / encode
authorAlan T. DeKok <aland@freeradius.org>
Thu, 22 Jun 2017 20:16:32 +0000 (16:16 -0400)
committerAlan T. DeKok <aland@freeradius.org>
Thu, 22 Jun 2017 20:16:32 +0000 (16:16 -0400)
src/modules/proto_radius/proto_radius_acct.c
src/modules/proto_radius/proto_radius_auth.c
src/modules/proto_radius/proto_radius_coa.c

index 9b5c243eb76ade309a6d0e6b8e2a435fdba5ae70..a00ef74c59b1a967d3b53ebe8386b6c8178cd60a 100644 (file)
@@ -41,18 +41,9 @@ static fr_io_final_t mod_process(REQUEST *request, UNUSED fr_io_action_t action)
 
        switch (request->request_state) {
        case REQUEST_INIT:
-               if (request->packet->data_len != 0) {
-                       if (fr_radius_packet_decode(request->packet, NULL, request->client->secret) < 0) {
-                               RDEBUG("Failed decoding RADIUS packet: %s", fr_strerror());
-                               return FR_IO_FAIL;
-                       }
-
-                       if (RDEBUG_ENABLED) common_packet_debug(request, request->packet, true);
-               } else {
-                       radlog_request(L_DBG, L_DBG_LVL_1, request, "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, "");
-               }
+               radlog_request(L_DBG, L_DBG_LVL_1, request, "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, "");
 
                request->component = "radius";
 
@@ -195,16 +186,6 @@ static fr_io_final_t mod_process(REQUEST *request, UNUSED fr_io_action_t action)
 #endif
 
                if (RDEBUG_ENABLED) common_packet_debug(request, request->reply, false);
-
-               if (fr_radius_packet_encode(request->reply, request->packet, request->client->secret) < 0) {
-                       RDEBUG("Failed encoding RADIUS reply: %s", fr_strerror());
-                       return FR_IO_FAIL;
-               }
-
-               if (fr_radius_packet_sign(request->reply, request->packet, request->client->secret) < 0) {
-                       RDEBUG("Failed signing RADIUS reply: %s", fr_strerror());
-                       return FR_IO_FAIL;
-               }
                break;
 
        default:
index e7509cfa5581417004427e2cd30ac19b870194c2..1e193d5a937820445d947d66eeda4386f2a3db39 100644 (file)
@@ -126,18 +126,9 @@ static fr_io_final_t mod_process(REQUEST *request, UNUSED fr_io_action_t action)
 
        switch (request->request_state) {
        case REQUEST_INIT:
-               if (request->packet->data_len != 0) {
-                       if (fr_radius_packet_decode(request->packet, NULL, request->client->secret) < 0) {
-                               RDEBUG("Failed decoding RADIUS packet: %s", fr_strerror());
-                               return FR_IO_FAIL;
-                       }
-
-                       if (RDEBUG_ENABLED) common_packet_debug(request, request->packet, true);
-               } else {
-                       radlog_request(L_DBG, L_DBG_LVL_1, request, "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, "");
-               }
+               radlog_request(L_DBG, L_DBG_LVL_1, request, "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, "");
 
                request->component = "radius";
 
@@ -511,16 +502,6 @@ static fr_io_final_t mod_process(REQUEST *request, UNUSED fr_io_action_t action)
 #endif
 
                if (RDEBUG_ENABLED) common_packet_debug(request, request->reply, false);
-
-               if (fr_radius_packet_encode(request->reply, request->packet, request->client->secret) < 0) {
-                       RDEBUG("Failed encoding RADIUS reply: %s", fr_strerror());
-                       return FR_IO_FAIL;
-               }
-
-               if (fr_radius_packet_sign(request->reply, request->packet, request->client->secret) < 0) {
-                       RDEBUG("Failed signing RADIUS reply: %s", fr_strerror());
-                       return FR_IO_FAIL;
-               }
                break;
 
        default:
index 8600a24c0848f14a5faef3596e8e6e054b0a2cbf..55326f90c6155881110236517fc0ff07acc63b5e 100644 (file)
@@ -40,18 +40,9 @@ static fr_io_final_t mod_process(REQUEST *request, UNUSED fr_io_action_t action)
 
        switch (request->request_state) {
        case REQUEST_INIT:
-               if (request->packet->data_len != 0) {
-                       if (fr_radius_packet_decode(request->packet, NULL, request->client->secret) < 0) {
-                               RDEBUG("Failed decoding RADIUS packet: %s", fr_strerror());
-                               return FR_IO_FAIL;
-                       }
-
-                       if (RDEBUG_ENABLED) common_packet_debug(request, request->packet, true);
-               } else {
-                       radlog_request(L_DBG, L_DBG_LVL_1, request, "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, "");
-               }
+               radlog_request(L_DBG, L_DBG_LVL_1, request, "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, "");
 
                request->component = "radius";
 
@@ -233,16 +224,6 @@ static fr_io_final_t mod_process(REQUEST *request, UNUSED fr_io_action_t action)
 #endif
 
                if (RDEBUG_ENABLED) common_packet_debug(request, request->reply, false);
-
-               if (fr_radius_packet_encode(request->reply, request->packet, request->client->secret) < 0) {
-                       RDEBUG("Failed encoding RADIUS reply: %s", fr_strerror());
-                       return FR_IO_FAIL;
-               }
-
-               if (fr_radius_packet_sign(request->reply, request->packet, request->client->secret) < 0) {
-                       RDEBUG("Failed signing RADIUS reply: %s", fr_strerror());
-                       return FR_IO_FAIL;
-               }
                break;
 
        default: