From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 24 Jan 2023 01:12:08 +0000 (-0500)
Subject: clean up and standardize names
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1140c00ce68ca5ae92cf1d36715c0fd71a8573b;p=thirdparty%2Ffreeradius-server.git

clean up and standardize names

perl -p -i -e 's/fr_request_types/fr_radius_request_name_table/g' $(git grep -l fr_request_types)
---

diff --git a/src/bin/radclient.c b/src/bin/radclient.c
index 23b7d00e629..8b1d9e9f75f 100644
--- a/src/bin/radclient.c
+++ b/src/bin/radclient.c
@@ -1700,7 +1700,7 @@ int main(int argc, char **argv)
 	 *	Get the request type
 	 */
 	if (!isdigit((uint8_t) argv[2][0])) {
-		packet_code = fr_table_value_by_str(fr_request_types, argv[2], -2);
+		packet_code = fr_table_value_by_str(fr_radius_request_name_table, argv[2], -2);
 		if (packet_code == -2) {
 			ERROR("Unrecognised request type \"%s\"", argv[2]);
 			usage();
diff --git a/src/bin/radsnmp.c b/src/bin/radsnmp.c
index 55fd6192ec7..4d3e8f2c26e 100644
--- a/src/bin/radsnmp.c
+++ b/src/bin/radsnmp.c
@@ -1068,7 +1068,7 @@ int main(int argc, char **argv)
 	if (!isdigit((uint8_t) argv[2][0])) {
 		int code;
 
-		code = fr_table_value_by_str(fr_request_types, argv[2], -1);
+		code = fr_table_value_by_str(fr_radius_request_name_table, argv[2], -1);
 		if (code < 0) {
 			ERROR("Unrecognised request type \"%s\"", argv[2]);
 			usage();
diff --git a/src/protocols/radius/base.c b/src/protocols/radius/base.c
index 4d544d1b415..1392a99781a 100644
--- a/src/protocols/radius/base.c
+++ b/src/protocols/radius/base.c
@@ -80,7 +80,7 @@ fr_dict_attr_autoload_t libfreeradius_radius_dict_attr[] = {
  */
 #define FR_DEBUG_STRERROR_PRINTF if (fr_debug_lvl) fr_strerror_printf_push
 
-fr_table_num_sorted_t const fr_request_types[] = {
+fr_table_num_sorted_t const fr_radius_request_name_table[] = {
 	{ L("acct"),	FR_RADIUS_CODE_ACCOUNTING_REQUEST	},
 	{ L("auth"),	FR_RADIUS_CODE_ACCESS_REQUEST		},
 	{ L("auto"),	FR_RADIUS_CODE_UNDEFINED		},
@@ -89,7 +89,7 @@ fr_table_num_sorted_t const fr_request_types[] = {
 	{ L("disconnect"),	FR_RADIUS_CODE_DISCONNECT_REQUEST	},
 	{ L("status"),	FR_RADIUS_CODE_STATUS_SERVER		}
 };
-size_t fr_request_types_len = NUM_ELEMENTS(fr_request_types);
+size_t fr_radius_request_name_table_len = NUM_ELEMENTS(fr_radius_request_name_table);
 
 char const *fr_radius_packet_names[FR_RADIUS_CODE_MAX] = {
 	"",					//!< 0
@@ -147,14 +147,6 @@ char const *fr_radius_packet_names[FR_RADIUS_CODE_MAX] = {
 	"Protocol-Error",
 };
 
-bool const fr_request_packets[FR_RADIUS_CODE_MAX + 1] = {
-	[FR_RADIUS_CODE_ACCESS_REQUEST] = true,
-	[FR_RADIUS_CODE_ACCOUNTING_REQUEST] = true,
-	[FR_RADIUS_CODE_STATUS_SERVER] = true,
-	[FR_RADIUS_CODE_COA_REQUEST] = true,
-	[FR_RADIUS_CODE_DISCONNECT_REQUEST] = true,
-};
-
 
 /**  Do Ascend-Send / Recv-Secret calculation.
  *
diff --git a/src/protocols/radius/radius.h b/src/protocols/radius/radius.h
index 0687a1e6994..02227fc31eb 100644
--- a/src/protocols/radius/radius.h
+++ b/src/protocols/radius/radius.h
@@ -54,9 +54,8 @@ extern char const *fr_radius_packet_names[FR_RADIUS_CODE_MAX];
 #define AUTH_PASS_LEN (RADIUS_AUTH_VECTOR_LENGTH)
 
 #define	FR_TUNNEL_FR_ENC_LENGTH(_x) (2 + 1 + _x + PAD(_x + 1, 16))
-extern fr_table_num_sorted_t const fr_request_types[];
-extern size_t fr_request_types_len;
-extern bool const fr_request_packets[FR_RADIUS_CODE_MAX + 1];
+extern fr_table_num_sorted_t const fr_radius_request_name_table[];
+extern size_t fr_radius_request_name_table_len;
 
 typedef enum {
 	DECODE_FAIL_NONE = 0,