From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 31 Mar 2021 17:04:34 +0000 (-0400)
Subject: add / delete incoming sockets to proxy list, if they're send_coa
X-Git-Tag: release_3_0_24~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fe0915a611dbea0fdb55a4ea220c3eb6c35cbc8;p=thirdparty%2Ffreeradius-server.git

add / delete incoming sockets to proxy list, if they're send_coa
---

diff --git a/src/main/process.c b/src/main/process.c
index a32a934ce24..55b1b2af085 100644
--- a/src/main/process.c
+++ b/src/main/process.c
@@ -2092,7 +2092,11 @@ static void tcp_socket_timer(void *ctx)
 			 *	open to listen for replies to requests we had
 			 *	previously sent.
 			 */
-			if (listener->type == RAD_LISTEN_PROXY) {
+			if (listener->type == RAD_LISTEN_PROXY
+#ifdef WITH_COA_TUNNEL
+			    || listener->send_coa
+#endif
+				) {
 				PTHREAD_MUTEX_LOCK(&proxy_mutex);
 				if (!fr_packet_list_socket_freeze(proxy_list,
 								  listener->fd)) {
@@ -5233,6 +5237,31 @@ static void event_new_fd(rad_listen_t *this)
 					fr_exit(1);
 				}
 			}
+
+#ifdef WITH_COA_TUNNEL
+			/*
+			 *	If we're allowed to send CoA requests
+			 *	back down this incoming socket, then
+			 *	add the socket to the proxy listener
+			 *	list.  We need to check for "parent",
+			 *	as the main incoming listener has
+			 *	"send_coa" set, but it just calls
+			 *	accept(), and doesn't actually send
+			 *	any packets.
+			 */
+			if (this->send_coa && this->parent) {
+				PTHREAD_MUTEX_LOCK(&proxy_mutex);
+				if(!fr_packet_list_socket_add(proxy_list, this->fd,
+							      sock->proto,
+							      &sock->other_ipaddr, sock->other_port,
+							      this)) {
+					ERROR("Failed adding proxy socket");
+					fr_exit_now(1);
+				}
+				PTHREAD_MUTEX_UNLOCK(&proxy_mutex);
+			}
+#endif	/* WITH_COA_TUNNEL */
+
 #endif	/* WITH_TCP */
 			break;
 		} /* switch over listener types */
@@ -5297,7 +5326,11 @@ static void event_new_fd(rad_listen_t *this)
 		/*
 		 *	Tell all requests using this socket that the socket is dead.
 		 */
-		if (this->type == RAD_LISTEN_PROXY) {
+		if (this->type == RAD_LISTEN_PROXY
+#ifdef WITH_COA_TUNNEL
+		    || (this->send_coa && this->parent)
+#endif
+			) {
 			PTHREAD_MUTEX_LOCK(&proxy_mutex);
 			if (!fr_packet_list_socket_freeze(proxy_list,
 							  this->fd)) {