Reorder args in mod_network_get

diff --git a/src/lib/io/base.h b/src/lib/io/base.h
index 77c38e85bb98bbe1d24bed9c618d67ad62962955..3f474654c8765c470f1a7e26ce285ef2033e0472 100644 (file)
--- a/src/lib/io/base.h
+++ b/src/lib/io/base.h
@@ -344,7 +344,14 @@ typedef struct fr_client_s fr_client_t;
 
 typedef fr_client_t *(*fr_io_client_find_t)(fr_listen_t *li, fr_ipaddr_t const *ipaddr, int ipproto);
 
-typedef void (*fr_io_network_get_t)(void *instance, int *ipproto, bool *dynamic_clients, fr_trie_t const **trie);
+/** Callback to return network properties
+ *
+ * @param[out] ipproto         IP protocol (AF_INET or AF_INET6).
+ * @param[out] dynamic_clients Whether clients are dynamic.
+ * @param[out] trie            Trie of clients.
+ * @param[in] instance         Instance data.
+ */
+typedef void (*fr_io_network_get_t)(int *ipproto, bool *dynamic_clients, fr_trie_t const **trie, void *instance);
 
 typedef char const *(*fr_io_name_t)(fr_listen_t *li);
 

diff --git a/src/lib/io/master.c b/src/lib/io/master.c
index 3a090be5cdb2e5715ff163c1ae89842f6994b1fc..177c1667bd4142deb44be5e2867009697471ffac 100644 (file)
--- a/src/lib/io/master.c
+++ b/src/lib/io/master.c
@@ -2664,7 +2664,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
         *      application IO module.
         */
        if (inst->app_io->network_get) {
-               inst->app_io->network_get(inst->app_io_instance, &inst->ipproto, &inst->dynamic_clients, &inst->networks);
+               inst->app_io->network_get(&inst->ipproto, &inst->dynamic_clients, &inst->networks, inst->app_io_instance);
        }
 
        if ((inst->ipproto == IPPROTO_TCP) && !inst->app_io->connection_set) {

diff --git a/src/listen/bfd/proto_bfd_udp.c b/src/listen/bfd/proto_bfd_udp.c
index 14d7211c31364909faaced2fa5f4a5e520559890..6f6748b4fc2303ad152b84d3f613b772bde7db49 100644 (file)
--- a/src/listen/bfd/proto_bfd_udp.c
+++ b/src/listen/bfd/proto_bfd_udp.c
@@ -230,7 +230,7 @@ static ssize_t mod_write(fr_listen_t *li, void *packet_ctx, UNUSED fr_time_t req
        return rcode;
 }
 
-static void mod_network_get(void *instance, int *ipproto, bool *dynamic_clients, fr_trie_t const **trie)
+static void mod_network_get(int *ipproto, bool *dynamic_clients, fr_trie_t const **trie, void *instance)
 {
        proto_bfd_udp_t *inst = talloc_get_type_abort(instance, proto_bfd_udp_t);
 

diff --git a/src/listen/control/proto_control_unix.c b/src/listen/control/proto_control_unix.c
index d6b9bbf91db8dd9cc31869a23cf83434785092ad..ee6f52478ceb41e68760eb6b89a484633995388b 100644 (file)
--- a/src/listen/control/proto_control_unix.c
+++ b/src/listen/control/proto_control_unix.c
@@ -374,7 +374,7 @@ static int mod_connection_set(fr_listen_t *li, fr_io_address_t *connection)
        return 0;
 }
 
-static void mod_network_get(UNUSED void *instance, int *ipproto, bool *dynamic_clients, fr_trie_t const **trie)
+static void mod_network_get(int *ipproto, bool *dynamic_clients, fr_trie_t const **trie, UNUSED void *instance)
 {
        *ipproto = IPPROTO_TCP;
        *dynamic_clients = false;

diff --git a/src/listen/dhcpv4/proto_dhcpv4_udp.c b/src/listen/dhcpv4/proto_dhcpv4_udp.c
index ba1598399df38d5b5497762404dae6f8c87574dd..0af615ecf2929db6d0a127258e7f75bcb0d56b7a 100644 (file)
--- a/src/listen/dhcpv4/proto_dhcpv4_udp.c
+++ b/src/listen/dhcpv4/proto_dhcpv4_udp.c
@@ -487,7 +487,7 @@ static int mod_connection_set(fr_listen_t *li, fr_io_address_t *connection)
 }
 
 
-static void mod_network_get(void *instance, int *ipproto, bool *dynamic_clients, fr_trie_t const **trie)
+static void mod_network_get(int *ipproto, bool *dynamic_clients, fr_trie_t const **trie, void *instance)
 {
        proto_dhcpv4_udp_t              *inst = talloc_get_type_abort(instance, proto_dhcpv4_udp_t);
 

diff --git a/src/listen/dhcpv6/proto_dhcpv6_udp.c b/src/listen/dhcpv6/proto_dhcpv6_udp.c
index 8703c3b60c71b4c069627eb57efdf18dbbea68a6..2f103e8746b8ddb63f7611a27b8f804fa669c8e5 100644 (file)
--- a/src/listen/dhcpv6/proto_dhcpv6_udp.c
+++ b/src/listen/dhcpv6/proto_dhcpv6_udp.c
@@ -264,7 +264,7 @@ static int mod_connection_set(fr_listen_t *li, fr_io_address_t *connection)
 }
 
 
-static void mod_network_get(void *instance, int *ipproto, bool *dynamic_clients, fr_trie_t const **trie)
+static void mod_network_get(int *ipproto, bool *dynamic_clients, fr_trie_t const **trie, void *instance)
 {
        proto_dhcpv6_udp_t              *inst = talloc_get_type_abort(instance, proto_dhcpv6_udp_t);
 

diff --git a/src/listen/dns/proto_dns_udp.c b/src/listen/dns/proto_dns_udp.c
index 46e6b856aecad863c319b17226dc4d2542b21863..02cf550ea70601fcf670fc28da9e58d3fec15cf0 100644 (file)
--- a/src/listen/dns/proto_dns_udp.c
+++ b/src/listen/dns/proto_dns_udp.c
@@ -242,7 +242,7 @@ static int mod_connection_set(fr_listen_t *li, fr_io_address_t *connection)
 }
 
 
-static void mod_network_get(void *instance, int *ipproto, bool *dynamic_clients, fr_trie_t const **trie)
+static void mod_network_get(int *ipproto, bool *dynamic_clients, fr_trie_t const **trie, void *instance)
 {
        proto_dns_udp_t         *inst = talloc_get_type_abort(instance, proto_dns_udp_t);
 

diff --git a/src/listen/radius/proto_radius_tcp.c b/src/listen/radius/proto_radius_tcp.c
index fe357e11335dc8061d7e17599ba75d80510656e2..db4da6a99886111aff8074bb04aec15233d82957 100644 (file)
--- a/src/listen/radius/proto_radius_tcp.c
+++ b/src/listen/radius/proto_radius_tcp.c
@@ -317,7 +317,7 @@ static int mod_connection_set(fr_listen_t *li, fr_io_address_t *connection)
 }
 
 
-static void mod_network_get(void *instance, int *ipproto, bool *dynamic_clients, fr_trie_t const **trie)
+static void mod_network_get(int *ipproto, bool *dynamic_clients, fr_trie_t const **trie, void *instance)
 {
        proto_radius_tcp_t *inst = talloc_get_type_abort(instance, proto_radius_tcp_t);
 

diff --git a/src/listen/radius/proto_radius_udp.c b/src/listen/radius/proto_radius_udp.c
index ea9cc9e7c0af90c8e066f35d6b3204e426cfb7e2..9d342bf045f2f13f1e20ab0e6b5f8df391b39e77 100644 (file)
--- a/src/listen/radius/proto_radius_udp.c
+++ b/src/listen/radius/proto_radius_udp.c
@@ -288,7 +288,7 @@ static int mod_connection_set(fr_listen_t *li, fr_io_address_t *connection)
 }
 
 
-static void mod_network_get(void *instance, int *ipproto, bool *dynamic_clients, fr_trie_t const **trie)
+static void mod_network_get(int *ipproto, bool *dynamic_clients, fr_trie_t const **trie, void *instance)
 {
        proto_radius_udp_t *inst = talloc_get_type_abort(instance, proto_radius_udp_t);
 

diff --git a/src/listen/tacacs/proto_tacacs_tcp.c b/src/listen/tacacs/proto_tacacs_tcp.c
index c0d4caf9d655b0cf0896a2620dd6f50ff6fed0ab..8c089d9d3553eee1fe261252390fb2dbbb534ea3 100644 (file)
--- a/src/listen/tacacs/proto_tacacs_tcp.c
+++ b/src/listen/tacacs/proto_tacacs_tcp.c
@@ -317,7 +317,7 @@ static int mod_connection_set(fr_listen_t *li, fr_io_address_t *connection)
        return 0;
 }
 
-static void mod_network_get(void *instance, int *ipproto, bool *dynamic_clients, fr_trie_t const **trie)
+static void mod_network_get(int *ipproto, bool *dynamic_clients, fr_trie_t const **trie, void *instance)
 {
        proto_tacacs_tcp_t *inst = talloc_get_type_abort(instance, proto_tacacs_tcp_t);
 

diff --git a/src/listen/vmps/proto_vmps_udp.c b/src/listen/vmps/proto_vmps_udp.c
index e31a9e7d63ad75b2d70749ea471adcc88ddac238..5fc82c14dc5ce4653f09d6485d8b4a525dd098dc 100644 (file)
--- a/src/listen/vmps/proto_vmps_udp.c
+++ b/src/listen/vmps/proto_vmps_udp.c
@@ -266,7 +266,7 @@ static int mod_connection_set(fr_listen_t *li, fr_io_address_t *connection)
 }
 
 
-static void mod_network_get(void *instance, int *ipproto, bool *dynamic_clients, fr_trie_t const **trie)
+static void mod_network_get(int *ipproto, bool *dynamic_clients, fr_trie_t const **trie, void *instance)
 {
        proto_vmps_udp_t *inst = talloc_get_type_abort(instance, proto_vmps_udp_t);