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

Clean up and regularize names

perl -p -i -e 's/fr_dhcpv6_packet_types/fr_dhcpv6_packet_names/g' $(git grep -l fr_dhcpv6_packet_types)
---

diff --git a/src/listen/dhcpv6/proto_dhcpv6_udp.c b/src/listen/dhcpv6/proto_dhcpv6_udp.c
index 0a47eb62100..2e7ca69a5a1 100644
--- a/src/listen/dhcpv6/proto_dhcpv6_udp.c
+++ b/src/listen/dhcpv6/proto_dhcpv6_udp.c
@@ -186,7 +186,7 @@ static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time
 		if ((packet->code == FR_DHCPV6_SOLICIT) ||
 		    (packet->code == FR_DHCPV6_REBIND) ||
 		    (packet->code == FR_DHCPV6_CONFIRM)) {
-			RATE_LIMIT_GLOBAL(WARN, "Unicast packet %s - ignoring", fr_dhcpv6_packet_types[packet->code]);
+			RATE_LIMIT_GLOBAL(WARN, "Unicast packet %s - ignoring", fr_dhcpv6_packet_names[packet->code]);
 			return 0;
 		}
 	} /* else it was multicast... remember that */
@@ -200,7 +200,7 @@ static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time
 	/*
 	 *	Print out what we received.
 	 */
-	DEBUG2("Received %s XID %08x length %d %s", fr_dhcpv6_packet_types[packet->code], xid,
+	DEBUG2("Received %s XID %08x length %d %s", fr_dhcpv6_packet_names[packet->code], xid,
 	       (int) packet_len, thread->name);
 
 	return packet_len;
diff --git a/src/process/dhcpv6/base.c b/src/process/dhcpv6/base.c
index 96730737c72..4ef386a3691 100644
--- a/src/process/dhcpv6/base.c
+++ b/src/process/dhcpv6/base.c
@@ -299,7 +299,7 @@ static void dhcpv6_packet_debug(request_t *request, fr_radius_packet_t const *pa
 #endif
 		    "",
 		    received ? "Received" : "Sending",
-		    fr_dhcpv6_packet_types[packet->code],
+		    fr_dhcpv6_packet_names[packet->code],
 		    packet->id,
 		    packet->socket.inet.src_ipaddr.af == AF_INET6 ? "[" : "",
 		    fr_box_ipaddr(packet->socket.inet.src_ipaddr),
diff --git a/src/protocols/dhcpv6/base.c b/src/protocols/dhcpv6/base.c
index 440dad8ed93..bdc486f5017 100644
--- a/src/protocols/dhcpv6/base.c
+++ b/src/protocols/dhcpv6/base.c
@@ -68,7 +68,7 @@ fr_dict_attr_autoload_t libfreeradius_dhcpv6_dict_attr[] = {
 /*
  * grep VALUE share/dictionary/dhcpv6/dictionary.freeradius.internal  | awk '{print "[" $4 "] = \"" $3 "\"," }'
  */
-char const *fr_dhcpv6_packet_types[FR_DHCPV6_CODE_MAX] = {
+char const *fr_dhcpv6_packet_names[FR_DHCPV6_CODE_MAX] = {
 	 [0]						= "invalid",
 	 [FR_PACKET_TYPE_VALUE_SOLICIT]			= "Solicit",
 	 [FR_PACKET_TYPE_VALUE_ADVERTISE]		= "Advertise",
@@ -834,7 +834,7 @@ static void dhcpv6_print_hex(FILE *fp, uint8_t const *packet, size_t packet_len,
 
 	fprintf(fp, "%.*s", depth, tabs);
 	if ((packet[0] > 0) && (packet[0] < FR_DHCPV6_CODE_MAX)) {
-		fprintf(fp, "packet: %s\n", fr_dhcpv6_packet_types[packet[0]]);
+		fprintf(fp, "packet: %s\n", fr_dhcpv6_packet_names[packet[0]]);
 	} else {
 		fprintf(fp, "packet: %02x\n", packet[0]);
 	}
diff --git a/src/protocols/dhcpv6/dhcpv6.h b/src/protocols/dhcpv6/dhcpv6.h
index d74c222807b..1805eb730fe 100644
--- a/src/protocols/dhcpv6/dhcpv6.h
+++ b/src/protocols/dhcpv6/dhcpv6.h
@@ -104,7 +104,7 @@ typedef enum {
 
 #define FR_DHCPV6_PACKET_CODE_VALID(_code) (((_code) > 0) && ((_code) < FR_DHCPV6_CODE_MAX))
 
-extern char const		*fr_dhcpv6_packet_types[FR_DHCPV6_CODE_MAX];
+extern char const		*fr_dhcpv6_packet_names[FR_DHCPV6_CODE_MAX];
 
 /** subtype values for DHCPv4 and DHCPv6
  *