From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 25 Sep 2018 12:37:10 +0000 (-0400)
Subject: move mod_open() to using thread_instance
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fe3b461cd433ceb6092ba55438e097d44b2a51a;p=thirdparty%2Ffreeradius-server.git

move mod_open() to using thread_instance
---

diff --git a/src/modules/proto_detail/proto_detail_file.c b/src/modules/proto_detail/proto_detail_file.c
index a36ac61d376..cffae74b5b5 100644
--- a/src/modules/proto_detail/proto_detail_file.c
+++ b/src/modules/proto_detail/proto_detail_file.c
@@ -112,7 +112,7 @@ static void mod_vnode_extend(fr_listen_t *li, UNUSED uint32_t fflags)
  */
 static int mod_open(fr_listen_t *li)
 {
-	proto_detail_file_t *inst = talloc_get_type_abort(li->app_io_instance, proto_detail_file_t);
+	proto_detail_file_t *inst = talloc_get_type_abort(li->thread_instance, proto_detail_file_t);
 	int oflag;
 
 #ifdef O_EVTONLY
diff --git a/src/modules/proto_detail/proto_detail_work.c b/src/modules/proto_detail/proto_detail_work.c
index 7931a7b90d9..5aa290b7d2e 100644
--- a/src/modules/proto_detail/proto_detail_work.c
+++ b/src/modules/proto_detail/proto_detail_work.c
@@ -672,7 +672,7 @@ free_track:
  */
 static int mod_open(fr_listen_t *li)
 {
-	proto_detail_work_t *inst = talloc_get_type_abort(li->app_io_instance, proto_detail_work_t);
+	proto_detail_work_t *inst = talloc_get_type_abort(li->thread_instance, proto_detail_work_t);
 
 	/*
 	 *	Open the file if we haven't already been given one.
diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4_udp.c b/src/modules/proto_dhcpv4/proto_dhcpv4_udp.c
index ac3ca935fee..4b7d5c9b8a0 100644
--- a/src/modules/proto_dhcpv4/proto_dhcpv4_udp.c
+++ b/src/modules/proto_dhcpv4/proto_dhcpv4_udp.c
@@ -459,7 +459,7 @@ static void mod_network_get(void *instance, int *ipproto, bool *dynamic_clients,
  */
 static int mod_open(fr_listen_t *li)
 {
-	proto_dhcpv4_udp_t *inst = talloc_get_type_abort(li->app_io_instance, proto_dhcpv4_udp_t);
+	proto_dhcpv4_udp_t *inst = talloc_get_type_abort(li->thread_instance, proto_dhcpv4_udp_t);
 
 	int				sockfd;
 	uint16_t			port = inst->port;
diff --git a/src/modules/proto_radius/proto_radius_tcp.c b/src/modules/proto_radius/proto_radius_tcp.c
index 4e657eae1fe..4fe72f1f5c1 100644
--- a/src/modules/proto_radius/proto_radius_tcp.c
+++ b/src/modules/proto_radius/proto_radius_tcp.c
@@ -290,7 +290,7 @@ static void mod_network_get(void *instance, int *ipproto, bool *dynamic_clients,
  */
 static int mod_open(fr_listen_t *li)
 {
-	proto_radius_tcp_t *inst = talloc_get_type_abort(li->app_io_instance, proto_radius_tcp_t);
+	proto_radius_tcp_t *inst = talloc_get_type_abort(li->thread_instance, proto_radius_tcp_t);
 
 	int				sockfd;
 	uint16_t			port = inst->port;
diff --git a/src/modules/proto_radius/proto_radius_udp.c b/src/modules/proto_radius/proto_radius_udp.c
index 8f7a0263fa3..769f961654e 100644
--- a/src/modules/proto_radius/proto_radius_udp.c
+++ b/src/modules/proto_radius/proto_radius_udp.c
@@ -298,7 +298,7 @@ static void mod_network_get(void *instance, int *ipproto, bool *dynamic_clients,
  */
 static int mod_open(fr_listen_t *li)
 {
-	proto_radius_udp_t *inst = talloc_get_type_abort(li->app_io_instance, proto_radius_udp_t);
+	proto_radius_udp_t *inst = talloc_get_type_abort(li->thread_instance, proto_radius_udp_t);
 
 	int				sockfd;
 	uint16_t			port = inst->port;
diff --git a/src/modules/proto_vmps/proto_vmps_udp.c b/src/modules/proto_vmps/proto_vmps_udp.c
index 05f483c8e8b..35e35aad474 100644
--- a/src/modules/proto_vmps/proto_vmps_udp.c
+++ b/src/modules/proto_vmps/proto_vmps_udp.c
@@ -297,7 +297,7 @@ static void mod_network_get(void *instance, int *ipproto, bool *dynamic_clients,
  */
 static int mod_open(fr_listen_t *li)
 {
-	proto_vmps_udp_t *inst = talloc_get_type_abort(li->app_io_instance, proto_vmps_udp_t);
+	proto_vmps_udp_t *inst = talloc_get_type_abort(li->thread_instance, proto_vmps_udp_t);
 
 	int				sockfd;
 	uint16_t			port = inst->port;