From: Alan T. DeKok Date: Tue, 2 May 2017 16:07:57 +0000 (-0400) Subject: rename fr_radius_encode/decode to fr_radius_packet_encode/decode X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acc91f7ca4d0a5d259bbee7314bba951915c5f22;p=thirdparty%2Ffreeradius-server.git rename fr_radius_encode/decode to fr_radius_packet_encode/decode --- diff --git a/src/include/libradius.h b/src/include/libradius.h index 8b7140f72c8..fd46519bb41 100644 --- a/src/include/libradius.h +++ b/src/include/libradius.h @@ -226,9 +226,9 @@ ssize_t fr_radius_recv_header(int sockfd, fr_ipaddr_t *src_ipaddr, uint16_t *sr int fr_radius_packet_verify(RADIUS_PACKET *packet, RADIUS_PACKET *original, char const *secret); -int fr_radius_decode(RADIUS_PACKET *packet, RADIUS_PACKET *original, char const *secret); +int fr_radius_packet_decode(RADIUS_PACKET *packet, RADIUS_PACKET *original, char const *secret); -int fr_radius_encode(RADIUS_PACKET *packet, RADIUS_PACKET const *original, char const *secret); +int fr_radius_packet_encode(RADIUS_PACKET *packet, RADIUS_PACKET const *original, char const *secret); int fr_radius_packet_sign(RADIUS_PACKET *packet, RADIUS_PACKET const *original, char const *secret); diff --git a/src/lib/util/radius.c b/src/lib/util/radius.c index 3b831d3e2e5..bdbcfee2246 100644 --- a/src/lib/util/radius.c +++ b/src/lib/util/radius.c @@ -580,7 +580,7 @@ int fr_radius_packet_send(RADIUS_PACKET *packet, RADIUS_PACKET const *original, /* * Encode the packet. */ - if (fr_radius_encode(packet, original, secret) < 0) { + if (fr_radius_packet_encode(packet, original, secret) < 0) { return -1; } @@ -1190,7 +1190,7 @@ int fr_radius_packet_verify(RADIUS_PACKET *packet, RADIUS_PACKET *original, char /** Encode a packet * */ -int fr_radius_encode(RADIUS_PACKET *packet, RADIUS_PACKET const *original, +int fr_radius_packet_encode(RADIUS_PACKET *packet, RADIUS_PACKET const *original, char const *secret) { radius_packet_t *hdr; @@ -1366,7 +1366,7 @@ int fr_radius_encode(RADIUS_PACKET *packet, RADIUS_PACKET const *original, * - 0 on success * - -1 on decoding error. */ -int fr_radius_decode(RADIUS_PACKET *packet, RADIUS_PACKET *original, char const *secret) +int fr_radius_packet_decode(RADIUS_PACKET *packet, RADIUS_PACKET *original, char const *secret) { int packet_length; uint32_t num_attributes; diff --git a/src/main/listen.c b/src/main/listen.c index 17da6cf053c..4567bf5b7dd 100644 --- a/src/main/listen.c +++ b/src/main/listen.c @@ -2429,7 +2429,7 @@ static int client_socket_encode(UNUSED rad_listen_t *listener, REQUEST *request) { if (!request->reply->code) return 0; - if (fr_radius_encode(request->reply, request->packet, request->client->secret) < 0) { + if (fr_radius_packet_encode(request->reply, request->packet, request->client->secret) < 0) { RPERROR("Failed encoding packet"); return -1; @@ -2481,14 +2481,14 @@ static int client_socket_decode(UNUSED rad_listen_t *listener, REQUEST *request) } #endif - return fr_radius_decode(request->packet, NULL, + return fr_radius_packet_decode(request->packet, NULL, request->client->secret); } #ifdef WITH_PROXY static int proxy_socket_encode(UNUSED rad_listen_t *listener, REQUEST *request) { - if (fr_radius_encode(request->proxy->packet, NULL, request->proxy->home_server->secret) < 0) { + if (fr_radius_packet_encode(request->proxy->packet, NULL, request->proxy->home_server->secret) < 0) { RPERROR("Failed encoding proxied packet"); return -1; @@ -2515,7 +2515,7 @@ static int proxy_socket_decode(UNUSED rad_listen_t *listener, REQUEST *request) * fr_radius_packet_verify is run in event.c, received_proxy_response() */ - return fr_radius_decode(request->proxy->reply, request->proxy->packet, + return fr_radius_packet_decode(request->proxy->reply, request->proxy->packet, request->proxy->home_server->secret); } #endif diff --git a/src/main/radclient.c b/src/main/radclient.c index cb24a70ef85..69cbe1bfb15 100644 --- a/src/main/radclient.c +++ b/src/main/radclient.c @@ -1072,7 +1072,7 @@ static int recv_one_packet(int wait_time) /* * If this fails, we're out of memory. */ - if (fr_radius_decode(request->reply, request->packet, secret) != 0) { + if (fr_radius_packet_decode(request->reply, request->packet, secret) != 0) { REDEBUG("Reply decode failed"); stats.lost++; goto packet_done; diff --git a/src/main/radsniff.c b/src/main/radsniff.c index f65d4e767ef..ccf2f2176dd 100644 --- a/src/main/radsniff.c +++ b/src/main/radsniff.c @@ -1393,7 +1393,7 @@ static void rs_packet_process(uint64_t count, rs_event_t *event, struct pcap_pkt FILE *log_fp = fr_log_fp; fr_log_fp = NULL; - ret = fr_radius_decode(current, original ? original->expect : NULL, conf->radius_secret); + ret = fr_radius_packet_decode(current, original ? original->expect : NULL, conf->radius_secret); fr_log_fp = log_fp; if (ret != 0) { fr_radius_free(¤t); @@ -1499,7 +1499,7 @@ static void rs_packet_process(uint64_t count, rs_event_t *event, struct pcap_pkt FILE *log_fp = fr_log_fp; fr_log_fp = NULL; - ret = fr_radius_decode(current, NULL, conf->radius_secret); + ret = fr_radius_packet_decode(current, NULL, conf->radius_secret); fr_log_fp = log_fp; if (ret != 0) { diff --git a/src/main/radsnmp.c b/src/main/radsnmp.c index b58143464f7..727af6ae81d 100644 --- a/src/main/radsnmp.c +++ b/src/main/radsnmp.c @@ -755,7 +755,7 @@ static int radsnmp_send_recv(radsnmp_conf_t *conf, int fd) unsigned int ret; unsigned int i; - if (fr_radius_encode(request, NULL, conf->secret) < 0) { + if (fr_radius_packet_encode(request, NULL, conf->secret) < 0) { ERROR("Failed encoding request: %s", fr_strerror()); return EXIT_FAILURE; } @@ -807,7 +807,7 @@ static int radsnmp_send_recv(radsnmp_conf_t *conf, int fd) talloc_free(request); continue; } - if (fr_radius_decode(reply, request, conf->secret) < 0) { + if (fr_radius_packet_decode(reply, request, conf->secret) < 0) { ERROR("Failed decoding reply: %s", fr_strerror()); goto recv_error; } diff --git a/src/main/tls_listen.c b/src/main/tls_listen.c index cf56930a517..e32a685b42c 100644 --- a/src/main/tls_listen.c +++ b/src/main/tls_listen.c @@ -394,7 +394,7 @@ int dual_tls_send(rad_listen_t *listener, REQUEST *request) /* * Pack the VPs */ - if (fr_radius_encode(request->reply, request->packet, + if (fr_radius_packet_encode(request->reply, request->packet, request->client->secret) < 0) { RPERROR("Failed encoding packet"); return 0; diff --git a/src/modules/proto_radius/proto_radius_acct.c b/src/modules/proto_radius/proto_radius_acct.c index 56072d34506..d8758b62558 100644 --- a/src/modules/proto_radius/proto_radius_acct.c +++ b/src/modules/proto_radius/proto_radius_acct.c @@ -53,7 +53,7 @@ static void acct_running(REQUEST *request, fr_state_action_t action) switch (request->request_state) { case REQUEST_INIT: if (request->packet->data_len != 0) { - if (fr_radius_decode(request->packet, NULL, request->client->secret) < 0) { + if (fr_radius_packet_decode(request->packet, NULL, request->client->secret) < 0) { RDEBUG("Failed decoding RADIUS packet: %s", fr_strerror()); goto done; } @@ -209,7 +209,7 @@ static void acct_running(REQUEST *request, fr_state_action_t action) if (RDEBUG_ENABLED) common_packet_debug(request, request->reply, false); - if (fr_radius_encode(request->reply, request->packet, request->client->secret) < 0) { + if (fr_radius_packet_encode(request->reply, request->packet, request->client->secret) < 0) { RDEBUG("Failed encoding RADIUS reply: %s", fr_strerror()); goto done; } diff --git a/src/modules/proto_radius/proto_radius_auth.c b/src/modules/proto_radius/proto_radius_auth.c index 8605ab3daf2..09dff876fcf 100644 --- a/src/modules/proto_radius/proto_radius_auth.c +++ b/src/modules/proto_radius/proto_radius_auth.c @@ -324,7 +324,7 @@ static void auth_running(REQUEST *request, fr_state_action_t action) switch (request->request_state) { case REQUEST_INIT: if (request->packet->data_len != 0) { - if (fr_radius_decode(request->packet, NULL, request->client->secret) < 0) { + if (fr_radius_packet_decode(request->packet, NULL, request->client->secret) < 0) { RDEBUG("Failed decoding RADIUS packet: %s", fr_strerror()); goto done; /* don't reject it, Message-Authenticator might be wrong */ } @@ -766,7 +766,7 @@ static void auth_running(REQUEST *request, fr_state_action_t action) } #endif - if (fr_radius_encode(request->reply, request->packet, request->client->secret) < 0) { + if (fr_radius_packet_encode(request->reply, request->packet, request->client->secret) < 0) { RDEBUG("Failed encoding RADIUS reply: %s", fr_strerror()); goto stop_processing; } diff --git a/src/modules/proto_radius/proto_radius_coa.c b/src/modules/proto_radius/proto_radius_coa.c index 3d6104bf2da..e59d393bf88 100644 --- a/src/modules/proto_radius/proto_radius_coa.c +++ b/src/modules/proto_radius/proto_radius_coa.c @@ -53,7 +53,7 @@ static void coa_running(REQUEST *request, fr_state_action_t action) switch (request->request_state) { case REQUEST_INIT: if (request->packet->data_len != 0) { - if (fr_radius_decode(request->packet, NULL, request->client->secret) < 0) { + if (fr_radius_packet_decode(request->packet, NULL, request->client->secret) < 0) { RDEBUG("Failed decoding RADIUS packet: %s", fr_strerror()); goto done; } @@ -248,7 +248,7 @@ static void coa_running(REQUEST *request, fr_state_action_t action) if (RDEBUG_ENABLED) common_packet_debug(request, request->reply, false); - if (fr_radius_encode(request->reply, request->packet, request->client->secret) < 0) { + if (fr_radius_packet_encode(request->reply, request->packet, request->client->secret) < 0) { RDEBUG("Failed encoding RADIUS reply: %s", fr_strerror()); goto done; } diff --git a/src/modules/proto_radius/proto_radius_status.c b/src/modules/proto_radius/proto_radius_status.c index 49e88444806..1a60d1db730 100644 --- a/src/modules/proto_radius/proto_radius_status.c +++ b/src/modules/proto_radius/proto_radius_status.c @@ -52,7 +52,7 @@ static void status_running(REQUEST *request, fr_state_action_t action) switch (request->request_state) { case REQUEST_INIT: if (request->packet->data_len != 0) { - if (fr_radius_decode(request->packet, NULL, request->client->secret) < 0) { + if (fr_radius_packet_decode(request->packet, NULL, request->client->secret) < 0) { RDEBUG("Failed decoding RADIUS packet: %s", fr_strerror()); goto done; } @@ -209,7 +209,7 @@ static void status_running(REQUEST *request, fr_state_action_t action) if (RDEBUG_ENABLED) common_packet_debug(request, request->reply, false); - if (fr_radius_encode(request->reply, request->packet, request->client->secret) < 0) { + if (fr_radius_packet_encode(request->reply, request->packet, request->client->secret) < 0) { RDEBUG("Failed encoding RADIUS reply: %s", fr_strerror()); goto done; }