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

clean up and dedup FR_RADIUS_PACKET_CODE_VALID

perl -p -i -e 's/is_radius_code/FR_RADIUS_PACKET_CODE_VALID/g' $(find . -name "*.[ch]" -print)
---

diff --git a/src/bin/radclient.c b/src/bin/radclient.c
index f7b2b4a7f2d..23b7d00e629 100644
--- a/src/bin/radclient.c
+++ b/src/bin/radclient.c
@@ -1159,7 +1159,7 @@ static int recv_coa_packet(fr_time_delta_t wait_time)
 	 *	packet matched that.
 	 */
 	if (request->reply->code != request->filter_code) {
-		if (is_radius_code(request->reply->code)) {
+		if (FR_RADIUS_PACKET_CODE_VALID(request->reply->code)) {
 			REDEBUG("%s: Expected %s got %s", request->name, fr_radius_packet_names[request->filter_code],
 				fr_radius_packet_names[request->reply->code]);
 		} else {
@@ -1354,7 +1354,7 @@ static int recv_one_packet(fr_time_delta_t wait_time)
 	 *	packet matched that.
 	 */
 	if ((request->filter_code != FR_RADIUS_CODE_UNDEFINED) && (request->reply->code != request->filter_code)) {
-		if (is_radius_code(request->reply->code)) {
+		if (FR_RADIUS_PACKET_CODE_VALID(request->reply->code)) {
 			REDEBUG("%s: Expected %s got %s", request->name, fr_radius_packet_names[request->filter_code],
 				fr_radius_packet_names[request->reply->code]);
 		} else {
diff --git a/src/bin/radsniff.c b/src/bin/radsniff.c
index 160c5d7f7a2..cc922ac9c8d 100644
--- a/src/bin/radsniff.c
+++ b/src/bin/radsniff.c
@@ -336,7 +336,7 @@ static void rs_packet_print_csv(uint64_t count, rs_status_t status, fr_pcap_t *h
 	}
 
 	/* Status, Type, Interface, Src, Src port, Dst, Dst port, ID */
-	if (is_radius_code(packet->code)) {
+	if (FR_RADIUS_PACKET_CODE_VALID(packet->code)) {
 		if (fr_sbuff_in_sprintf(&sbuff, "%s,%s,%s,%i,%s,%i,%i,",
 					fr_radius_packet_names[packet->code], handle->name,
 					src, packet->socket.inet.src_port, dst, packet->socket.inet.dst_port, packet->id) < 0) return;
@@ -409,7 +409,7 @@ static void rs_packet_print_fancy(uint64_t count, rs_status_t status, fr_pcap_t
 		if (s <= 0) return;
 	}
 
-	if (is_radius_code(packet->code)) {
+	if (FR_RADIUS_PACKET_CODE_VALID(packet->code)) {
 		len = snprintf(p, s, "%s Id %i %s:%s:%d %s %s:%i ",
 			       fr_radius_packet_names[packet->code],
 			       packet->id,
diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
index c5c4237f5b5..1ba6b7dd7da 100644
--- a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
@@ -377,7 +377,7 @@ static rlm_rcode_t CC_HINT(nonnull) process_reply(eap_session_t *eap_session, fr
 		 *	Note that we don't do *anything* with the reply
 		 *	attributes.
 		 */
-		if (is_radius_code(reply->code)) {
+		if (FR_RADIUS_PACKET_CODE_VALID(reply->code)) {
 			RDEBUG2("Got tunneled reply %s", fr_radius_packet_names[reply->code]);
 		} else {
 			RDEBUG2("Got tunneled reply code %i", reply->code);
diff --git a/src/protocols/radius/defs.h b/src/protocols/radius/defs.h
index 746f00fd1dd..21d3ab5f27f 100644
--- a/src/protocols/radius/defs.h
+++ b/src/protocols/radius/defs.h
@@ -54,8 +54,6 @@ typedef enum {
 	FR_RADIUS_CODE_DO_NOT_RESPOND		= 256	//!< Special rcode to indicate we will not respond.
 } fr_radius_packet_code_t;
 
-#define FR_RADIUS_PACKET_CODE_VALID(_code) (((_code) > 0) && ((_code) < FR_RADIUS_CODE_MAX))
-
 #define FR_AUTH_UDP_PORT		1812
 #define FR_AUTH_UDP_PORT_ALT		1645
 #define FR_ACCT_UDP_PORT		1813
diff --git a/src/protocols/radius/list.c b/src/protocols/radius/list.c
index ad2723ea708..bf55a435d74 100644
--- a/src/protocols/radius/list.c
+++ b/src/protocols/radius/list.c
@@ -741,7 +741,7 @@ void fr_packet_header_log(fr_log_t const *log, fr_radius_packet_t *packet, bool
 	 *
 	 *	This really belongs in a utility library
 	 */
-	if (is_radius_code(packet->code)) {
+	if (FR_RADIUS_PACKET_CODE_VALID(packet->code)) {
 		fr_log(log, L_DBG, __FILE__, __LINE__,
 		       "%s %s Id %i from %s%s%s:%i to %s%s%s:%i "
 #ifdef WITH_IFINDEX_NAME_RESOLUTION
diff --git a/src/protocols/radius/radius.h b/src/protocols/radius/radius.h
index 4fc8d8aa91d..0687a1e6994 100644
--- a/src/protocols/radius/radius.h
+++ b/src/protocols/radius/radius.h
@@ -49,7 +49,7 @@
  */
 
 extern char const *fr_radius_packet_names[FR_RADIUS_CODE_MAX];
-#define is_radius_code(_x) ((_x > 0) && (_x < FR_RADIUS_CODE_MAX))
+#define FR_RADIUS_PACKET_CODE_VALID(_x) ((_x > 0) && (_x < FR_RADIUS_CODE_MAX))
 
 #define AUTH_PASS_LEN (RADIUS_AUTH_VECTOR_LENGTH)