From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 14 Jun 2023 02:07:22 +0000 (-0400)
Subject: remove unused priority from mod_read()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6789bd05e5e434ca0e6c271c56a0bc314456e834;p=thirdparty%2Ffreeradius-server.git

remove unused priority from mod_read()

this is now a function of the app (proto_radius), and not the
IO layer (proto_radius_udp)
---

diff --git a/src/lib/io/base.h b/src/lib/io/base.h
index ec2d924bd13..77c38e85bb9 100644
--- a/src/lib/io/base.h
+++ b/src/lib/io/base.h
@@ -169,12 +169,11 @@ typedef size_t (*fr_io_nak_t)(fr_listen_t *li, void *packet_ctx, uint8_t *const
  * @param[in,out] buffer	the buffer where the raw packet will be written to (or read from)
  * @param[in] buffer_len	the length of the buffer
  * @param[out] leftover		bytes left in the buffer after reading a full packet.
- * @param[out] priority		priority of this packet (0 = low, 65535 = high)
  * @return
  *	- <0 on error
  *	- >=0 length of the data read or written.
  */
-typedef ssize_t (*fr_io_data_read_t)(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time, uint8_t *buffer, size_t buffer_len, size_t *leftover, uint32_t *priority);
+typedef ssize_t (*fr_io_data_read_t)(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time, uint8_t *buffer, size_t buffer_len, size_t *leftover);
 
 /** Write a socket.
  *
diff --git a/src/lib/io/master.c b/src/lib/io/master.c
index 05e9ad6e560..c0ee60eaa28 100644
--- a/src/lib/io/master.c
+++ b/src/lib/io/master.c
@@ -1208,7 +1208,7 @@ static int8_t alive_client_cmp(void const *one, void const *two)
  *  The app_io->read does the transport-specific data read.
  */
 static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time_p,
-			uint8_t *buffer, size_t buffer_len, size_t *leftover, uint32_t *priority)
+			uint8_t *buffer, size_t buffer_len, size_t *leftover)
 {
 	fr_io_instance_t const	*inst;
 	fr_io_thread_t		*thread;
@@ -1221,6 +1221,7 @@ static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time
 	fr_io_track_t		*track, *new_track;
 	fr_listen_t		*child;
 	int			value, accept_fd = -1;
+	uint32_t		priority = PRIORITY_NORMAL;
 
 	get_inst(li, &inst, &thread, &connection, &child);
 
@@ -1292,7 +1293,6 @@ redo:
 		 */
 		*packet_ctx = track;
 		*leftover = 0;
-		*priority = pending->priority;
 		recv_time = *recv_time_p = pending->recv_time;
 		client = track->client;
 
@@ -1388,7 +1388,7 @@ do_read:
 		 *	functions which do all of the TLS work.
 		 */
 		packet_len = inst->app_io->read(child, (void **) &local_address, &recv_time,
-					  buffer, buffer_len, leftover, priority);
+					  buffer, buffer_len, leftover);
 		if (packet_len <= 0) {
 			return packet_len;
 		}
@@ -1411,9 +1411,7 @@ do_read:
 				       inst->app_io->common.name, fr_box_ipaddr(address.socket.inet.src_ipaddr));
 				return 0;
 			}
-			*priority = value;
-		} else {
-			*priority = PRIORITY_NORMAL;
+			priority = value;
 		}
 
 		/*
@@ -1648,7 +1646,7 @@ have_client:
 			 *	Allocate the pending packet structure.
 			 */
 			pending = fr_io_pending_alloc(client, buffer, packet_len,
-						      track, *priority);
+						      track, priority);
 			if (!pending) {
 				DEBUG("Failed tracking packet from client %pV - discarding packet", fr_box_ipaddr(client->src_ipaddr));
 				goto done;
diff --git a/src/lib/io/network.c b/src/lib/io/network.c
index 68a00e935aa..dc06fd8ac0e 100644
--- a/src/lib/io/network.c
+++ b/src/lib/io/network.c
@@ -895,7 +895,7 @@ next_message:
 	 *	connection.
 	 */
 	data_size = s->listen->app_io->read(s->listen, &cd->packet_ctx, &cd->request.recv_time,
-					    cd->m.data, cd->m.rb_size, &s->leftover, &cd->priority);
+					    cd->m.data, cd->m.rb_size, &s->leftover);
 	if (data_size == 0) {
 		/*
 		 *	Cache the message for later.  This is
diff --git a/src/listen/arp/proto_arp_ethernet.c b/src/listen/arp/proto_arp_ethernet.c
index c770340c558..c4e3d87cd1b 100644
--- a/src/listen/arp/proto_arp_ethernet.c
+++ b/src/listen/arp/proto_arp_ethernet.c
@@ -57,7 +57,7 @@ static CONF_PARSER const arp_listen_config[] = {
 	CONF_PARSER_TERMINATOR
 };
 
-static ssize_t mod_read(fr_listen_t *li, UNUSED void **packet_ctx, fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len, size_t *leftover, UNUSED uint32_t *priority)
+static ssize_t mod_read(fr_listen_t *li, UNUSED void **packet_ctx, fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len, size_t *leftover)
 {
 	proto_arp_ethernet_thread_t	*thread = talloc_get_type_abort(li->thread_instance, proto_arp_ethernet_thread_t);
 	int				ret;
diff --git a/src/listen/bfd/proto_bfd_udp.c b/src/listen/bfd/proto_bfd_udp.c
index 978b9ec8d50..4b322c09139 100644
--- a/src/listen/bfd/proto_bfd_udp.c
+++ b/src/listen/bfd/proto_bfd_udp.c
@@ -107,7 +107,7 @@ static const CONF_PARSER udp_listen_config[] = {
 
 
 static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len,
-			size_t *leftover, UNUSED uint32_t *priority)
+			size_t *leftover)
 {
 	proto_bfd_udp_t const       	*inst = talloc_get_type_abort_const(li->app_io_instance, proto_bfd_udp_t);
 	proto_bfd_udp_thread_t		*thread = talloc_get_type_abort(li->thread_instance, proto_bfd_udp_thread_t);
diff --git a/src/listen/control/proto_control_unix.c b/src/listen/control/proto_control_unix.c
index f5eb8d66c09..cab45b0d56b 100644
--- a/src/listen/control/proto_control_unix.c
+++ b/src/listen/control/proto_control_unix.c
@@ -136,7 +136,7 @@ static SINT write_misc(void *instance, char const *buffer, INT buffer_size)
 /*
  *	Run a command.
  */
-static ssize_t mod_read_command(fr_listen_t *li, UNUSED void **packet_ctx, UNUSED fr_time_t *recv_time_p, uint8_t *buffer, UNUSED size_t buffer_len, UNUSED size_t *leftover, UNUSED uint32_t *priority)
+static ssize_t mod_read_command(fr_listen_t *li, UNUSED void **packet_ctx, UNUSED fr_time_t *recv_time_p, uint8_t *buffer, UNUSED size_t buffer_len, UNUSED size_t *leftover)
 {
 	proto_control_unix_t const     	*inst = talloc_get_type_abort_const(li->app_io_instance, proto_control_unix_t);
 	proto_control_unix_thread_t	*thread = talloc_get_type_abort(li->thread_instance, proto_control_unix_thread_t);
@@ -227,7 +227,7 @@ done:
 /*
  *	Process an initial connection request.
  */
-static ssize_t mod_read_init(fr_listen_t *li, UNUSED void **packet_ctx, UNUSED fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len, UNUSED size_t *leftover, UNUSED uint32_t *priority)
+static ssize_t mod_read_init(fr_listen_t *li, UNUSED void **packet_ctx, UNUSED fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len, UNUSED size_t *leftover)
 {
 	proto_control_unix_thread_t	*thread = talloc_get_type_abort(li->thread_instance, proto_control_unix_thread_t);
 	fr_conduit_hdr_t		*hdr = (fr_conduit_hdr_t *) buffer;
@@ -268,7 +268,7 @@ static ssize_t mod_read_init(fr_listen_t *li, UNUSED void **packet_ctx, UNUSED f
 	return 0;
 }
 
-static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len, size_t *leftover, uint32_t *priority)
+static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len, size_t *leftover)
 {
 	proto_control_unix_thread_t	*thread = talloc_get_type_abort(li->thread_instance, proto_control_unix_thread_t);
 	ssize_t				data_size;
@@ -303,10 +303,6 @@ static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time
 	*recv_time_p = fr_time();
 	*leftover = 0;
 
-	/*
-	 *	proto_control sets the priority
-	 */
-
 	/*
 	 *	Print out what we received.
 	 */
@@ -316,7 +312,7 @@ static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time
 	/*
 	 *	Run the state machine to process the rest of the packet.
 	 */
-	return thread->read(li, packet_ctx, recv_time_p, buffer, (size_t) data_size, leftover, priority);
+	return thread->read(li, packet_ctx, recv_time_p, buffer, (size_t) data_size, leftover);
 }
 
 
diff --git a/src/listen/cron/proto_cron_crontab.c b/src/listen/cron/proto_cron_crontab.c
index c8f5ad6ec45..b82e34f28a6 100644
--- a/src/listen/cron/proto_cron_crontab.c
+++ b/src/listen/cron/proto_cron_crontab.c
@@ -325,7 +325,7 @@ static int time_parse(UNUSED TALLOC_CTX *ctx, void *out, void *parent, CONF_ITEM
 	return 0;
 }
 
-static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len, size_t *leftover, UNUSED uint32_t *priority)
+static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len, size_t *leftover)
 {
 	proto_cron_crontab_t const	*inst = talloc_get_type_abort_const(li->app_io_instance, proto_cron_crontab_t);
 	proto_cron_crontab_thread_t	*thread = talloc_get_type_abort(li->thread_instance, proto_cron_crontab_thread_t);
diff --git a/src/listen/detail/proto_detail_work.c b/src/listen/detail/proto_detail_work.c
index d4de5dc863d..76ab1195d79 100644
--- a/src/listen/detail/proto_detail_work.c
+++ b/src/listen/detail/proto_detail_work.c
@@ -141,7 +141,7 @@ static fr_event_update_t resume_read[] = {
 	{ 0 }
 };
 
-static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len, size_t *leftover, uint32_t *priority)
+static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len, size_t *leftover)
 {
 	proto_detail_work_t const	*inst = talloc_get_type_abort_const(li->app_io_instance, proto_detail_work_t);
 	proto_detail_work_thread_t	*thread = talloc_get_type_abort(li->thread_instance, proto_detail_work_thread_t);
@@ -185,7 +185,6 @@ static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time
 		DEBUG("Retrying packet %d (retransmission %u)", track->id, track->retry.count);
 		*packet_ctx = track;
 		*recv_time_p = track->timestamp;
-		*priority = inst->parent->priority;
 		return track->packet_len;
 	}
 
@@ -501,7 +500,6 @@ redo:
 
 	*packet_ctx = track;
 	*recv_time_p = track->timestamp;
-	*priority = inst->parent->priority;
 
 done:
 	/*
diff --git a/src/listen/dhcpv4/proto_dhcpv4_udp.c b/src/listen/dhcpv4/proto_dhcpv4_udp.c
index 4ca277330f7..3deb4ff8ded 100644
--- a/src/listen/dhcpv4/proto_dhcpv4_udp.c
+++ b/src/listen/dhcpv4/proto_dhcpv4_udp.c
@@ -127,7 +127,7 @@ fr_dict_attr_autoload_t proto_dhcpv4_udp_dict_attr[] = {
 };
 
 static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len,
-			 size_t *leftover, UNUSED uint32_t *priority)
+			 size_t *leftover)
 {
 	proto_dhcpv4_udp_thread_t	*thread = talloc_get_type_abort(li->thread_instance, proto_dhcpv4_udp_thread_t);
 	fr_io_address_t			*address, **address_p;
diff --git a/src/listen/dhcpv6/proto_dhcpv6_udp.c b/src/listen/dhcpv6/proto_dhcpv6_udp.c
index 60ff1e62302..9c952d1b91e 100644
--- a/src/listen/dhcpv6/proto_dhcpv6_udp.c
+++ b/src/listen/dhcpv6/proto_dhcpv6_udp.c
@@ -129,7 +129,7 @@ fr_dict_attr_autoload_t proto_dhcpv6_udp_dict_attr[] = {
 };
 
 static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len,
-			size_t *leftover, UNUSED uint32_t *priority)
+			size_t *leftover)
 {
 	proto_dhcpv6_udp_t const	*inst = talloc_get_type_abort_const(li->app_io_instance, proto_dhcpv6_udp_t);
 	proto_dhcpv6_udp_thread_t	*thread = talloc_get_type_abort(li->thread_instance, proto_dhcpv6_udp_thread_t);
diff --git a/src/listen/dns/proto_dns_udp.c b/src/listen/dns/proto_dns_udp.c
index 9d5694c5df7..e6e71c80e23 100644
--- a/src/listen/dns/proto_dns_udp.c
+++ b/src/listen/dns/proto_dns_udp.c
@@ -113,7 +113,7 @@ fr_dict_attr_autoload_t proto_dns_udp_dict_attr[] = {
 };
 
 static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len,
-			size_t *leftover, UNUSED uint32_t *priority)
+			size_t *leftover)
 {
 //	proto_dns_udp_t const		*inst = talloc_get_type_abort_const(li->app_io_instance, proto_dns_udp_t);
 	proto_dns_udp_thread_t		*thread = talloc_get_type_abort(li->thread_instance, proto_dns_udp_thread_t);
diff --git a/src/listen/ldap_sync/proto_ldap_sync_ldap.c b/src/listen/ldap_sync/proto_ldap_sync_ldap.c
index 093982bbe66..2b34d927479 100644
--- a/src/listen/ldap_sync/proto_ldap_sync_ldap.c
+++ b/src/listen/ldap_sync/proto_ldap_sync_ldap.c
@@ -593,7 +593,7 @@ static int proto_ldap_child_mod_close(fr_listen_t *li)
  *     addition to their other data.
  */
 static ssize_t proto_ldap_child_mod_read(fr_listen_t *li, UNUSED void **packet_ctx, UNUSED fr_time_t *recv_time_p, UNUSED uint8_t *buffer,
-					 UNUSED size_t buffer_len, UNUSED size_t *leftover, UNUSED uint32_t *priority)
+					 UNUSED size_t buffer_len, UNUSED size_t *leftover)
 {
 	proto_ldap_sync_ldap_thread_t	*thread = talloc_get_type_abort(li->thread_instance, proto_ldap_sync_ldap_thread_t);
 	fr_ldap_connection_t		*conn = talloc_get_type_abort(thread->conn->h, fr_ldap_connection_t);
diff --git a/src/listen/load/proto_load_step.c b/src/listen/load/proto_load_step.c
index 3a2cbe198f9..2328da69800 100644
--- a/src/listen/load/proto_load_step.c
+++ b/src/listen/load/proto_load_step.c
@@ -95,7 +95,7 @@ static const CONF_PARSER load_listen_config[] = {
 };
 
 
-static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len, size_t *leftover, UNUSED uint32_t *priority)
+static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len, size_t *leftover)
 {
 	proto_load_step_t const		*inst = talloc_get_type_abort_const(li->app_io_instance, proto_load_step_t);
 	proto_load_step_thread_t	*thread = talloc_get_type_abort(li->thread_instance, proto_load_step_thread_t);
diff --git a/src/listen/radius/#proto_radius_tcp.c# b/src/listen/radius/#proto_radius_tcp.c#
index 420780c4681..827774b1c62 100644
--- a/src/listen/radius/#proto_radius_tcp.c#
+++ b/src/listen/radius/#proto_radius_tcp.c#
@@ -100,7 +100,7 @@ static const CONF_PARSER tcp_listen_config[] = {
 };
 
 
-static ssize_t mod_read(fr_listen_t *li, UNUSED void **packet_ctx, fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len, size_t *leftover, UNUSED uint32_t *priority)
+static ssize_t mod_read(fr_listen_t *li, UNUSED void **packet_ctx, fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len, size_t *leftover)
 {
 	proto_radius_tcp_t const       	*inst = talloc_get_type_abort_const(li->app_io_instance, proto_radius_tcp_t);
 	proto_radius_tcp_thread_t	*thread = talloc_get_type_abort(li->thread_instance, proto_radius_tcp_thread_t);
diff --git a/src/listen/radius/proto_radius_tcp.c b/src/listen/radius/proto_radius_tcp.c
index a90f9c867cd..db338b5e37c 100644
--- a/src/listen/radius/proto_radius_tcp.c
+++ b/src/listen/radius/proto_radius_tcp.c
@@ -100,7 +100,7 @@ static const CONF_PARSER tcp_listen_config[] = {
 };
 
 
-static ssize_t mod_read(fr_listen_t *li, UNUSED void **packet_ctx, fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len, size_t *leftover, UNUSED uint32_t *priority)
+static ssize_t mod_read(fr_listen_t *li, UNUSED void **packet_ctx, fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len, size_t *leftover)
 {
 	proto_radius_tcp_t const       	*inst = talloc_get_type_abort_const(li->app_io_instance, proto_radius_tcp_t);
 	proto_radius_tcp_thread_t	*thread = talloc_get_type_abort(li->thread_instance, proto_radius_tcp_thread_t);
diff --git a/src/listen/radius/proto_radius_udp.c b/src/listen/radius/proto_radius_udp.c
index 53ff17da4ed..e8bcce0dbb5 100644
--- a/src/listen/radius/proto_radius_udp.c
+++ b/src/listen/radius/proto_radius_udp.c
@@ -113,7 +113,7 @@ static const CONF_PARSER udp_listen_config[] = {
 
 
 static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len,
-			size_t *leftover, UNUSED uint32_t *priority)
+			size_t *leftover)
 {
 	proto_radius_udp_t const       	*inst = talloc_get_type_abort_const(li->app_io_instance, proto_radius_udp_t);
 	proto_radius_udp_thread_t	*thread = talloc_get_type_abort(li->thread_instance, proto_radius_udp_thread_t);
diff --git a/src/listen/tacacs/proto_tacacs_tcp.c b/src/listen/tacacs/proto_tacacs_tcp.c
index bdb099c9d04..7a1e15cfb9e 100644
--- a/src/listen/tacacs/proto_tacacs_tcp.c
+++ b/src/listen/tacacs/proto_tacacs_tcp.c
@@ -118,15 +118,13 @@ static const char *packet_name[] = {
  *				writing into the buffer.
  *				*leftover must be subtracted from buffer_len when
  *				calculating free space in the buffer.
- * @param[out] priority		unused.
  * @return
  *	- >0 when a packet was read successfully.
  *	- 0 when we read a partial packet.
  * 	- <0 on error (socket should be closed).
  */
 static ssize_t mod_read(fr_listen_t *li, UNUSED void **packet_ctx, fr_time_t *recv_time_p,
-			uint8_t *buffer, size_t buffer_len, size_t *leftover,
-			UNUSED uint32_t *priority)
+			uint8_t *buffer, size_t buffer_len, size_t *leftover)
 {
 	proto_tacacs_tcp_thread_t	*thread = talloc_get_type_abort(li->thread_instance, proto_tacacs_tcp_thread_t);
 	ssize_t				data_size, packet_len;
diff --git a/src/listen/vmps/proto_vmps_udp.c b/src/listen/vmps/proto_vmps_udp.c
index 788da4ed0b5..566acde51f4 100644
--- a/src/listen/vmps/proto_vmps_udp.c
+++ b/src/listen/vmps/proto_vmps_udp.c
@@ -100,7 +100,7 @@ static const CONF_PARSER udp_listen_config[] = {
 };
 
 
-static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len, size_t *leftover, UNUSED uint32_t *priority)
+static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time_p, uint8_t *buffer, size_t buffer_len, size_t *leftover)
 {
 	proto_vmps_udp_t const		*inst = talloc_get_type_abort_const(li->app_io_instance, proto_vmps_udp_t);
 	proto_vmps_udp_thread_t		*thread = talloc_get_type_abort(li->thread_instance, proto_vmps_udp_thread_t);