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 ec2d924bd1308c945d2ba270410ec2a57da5f5e8..77c38e85bb98bbe1d24bed9c618d67ad62962955 100644 (file)
--- 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 05e9ad6e5603985ab279069859bb98307efd561a..c0ee60eaa28cf21d5b694626da74fe723a56b0c6 100644 (file)
--- 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 68a00e935aaca71f9492427bb0ed39ad10d8a89a..dc06fd8ac0e7c937c33f36f308a1b8b5aecbbaee 100644 (file)
--- 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 c770340c558f1dc21d2b9b955e2457b499a0fd40..c4e3d87cd1b5efb88ec5e93db4c8b020054e6308 100644 (file)
--- 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 978b9ec8d5029958914482b6e2b901ee3b807fb9..4b322c091390bbca8783b414e51cc9b88a2e7a36 100644 (file)
--- 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 f5eb8d66c092299f3d06fcfc93d75c9382a2c865..cab45b0d56b90c8e33e6943dc1c918aa0e4647d0 100644 (file)
--- 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 c8f5ad6ec45fa8fc362a724274c59110ead7dee6..b82e34f28a6618609dd5b34b09a5b514d897c106 100644 (file)
--- 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 d4de5dc863d8559a445b12c9dd7cd2f543b06598..76ab1195d7972576b96c84f132fb4b1e7a5b9d0a 100644 (file)
--- 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 4ca277330f7b0bbee1cb2820d88af3a7b422d74a..3deb4ff8ded18d1dff2d3b927cc8922f1cbd3ff8 100644 (file)
--- 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 60ff1e62302d6023c660bd17f070f90194f06d1d..9c952d1b91ea9f28e749b069a51b2ca195549718 100644 (file)
--- 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 9d5694c5df7fa0dceb96c5f46bdc22f4c33fc46b..e6e71c80e232d6a35140446de1bcb8c107025eb0 100644 (file)
--- 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 093982bbe66289fd9c90a8e08f1f79f12f690ffc..2b34d927479f751fa99888fb46b7c09277c0efa9 100644 (file)
--- 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 3a2cbe198f9bff6afe77a4f96822171509c1fc4c..2328da6980069d5e11e5af4868b10554f35ff0a6 100644 (file)
--- 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 420780c4681b515e300874d4b8d488a3d4be21e0..827774b1c62772edb238b2e15a1a62d8163096a0 100644 (file)
--- 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 a90f9c867cdebc985aa8593cefda795c9e588e8c..db338b5e37cf5710cdbc29f448f42e067c5a116e 100644 (file)
--- 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 53ff17da4ed2605773bab9e73ceb2fb0f553f1b2..e8bcce0dbb5bb08f5684c513e29428369d27c659 100644 (file)
--- 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 bdb099c9d04330e921da9e68ba2dac848a503a32..7a1e15cfb9e16be83afebc73fc1ff56059e5bffc 100644 (file)
--- 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 788da4ed0b5c93e098e114057f9a0c96776278c4..566acde51f40b28049c504163348dc5509d3651d 100644 (file)
--- 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);