From: Alan T. DeKok Date: Thu, 22 Jun 2017 20:16:32 +0000 (-0400) Subject: don't call decode / encode X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58ec4fd1b46ac1e2648b4d2f4d2c43b0605ba7df;p=thirdparty%2Ffreeradius-server.git don't call decode / encode --- diff --git a/src/modules/proto_radius/proto_radius_acct.c b/src/modules/proto_radius/proto_radius_acct.c index 9b5c243eb76..a00ef74c59b 100644 --- a/src/modules/proto_radius/proto_radius_acct.c +++ b/src/modules/proto_radius/proto_radius_acct.c @@ -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: diff --git a/src/modules/proto_radius/proto_radius_auth.c b/src/modules/proto_radius/proto_radius_auth.c index e7509cfa558..1e193d5a937 100644 --- a/src/modules/proto_radius/proto_radius_auth.c +++ b/src/modules/proto_radius/proto_radius_auth.c @@ -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: diff --git a/src/modules/proto_radius/proto_radius_coa.c b/src/modules/proto_radius/proto_radius_coa.c index 8600a24c084..55326f90c61 100644 --- a/src/modules/proto_radius/proto_radius_coa.c +++ b/src/modules/proto_radius/proto_radius_coa.c @@ -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: