From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 21 Feb 2023 19:48:57 +0000 (-0500)
Subject: set idle timer when we CONNECT a socket
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63de5b222a0aea729788dcfe6e94568fe9796a64;p=thirdparty%2Ffreeradius-server.git

set idle timer when we CONNECT a socket

so that we don't need to check it on every packet.
---

diff --git a/src/lib/io/master.c b/src/lib/io/master.c
index ef0ecdf553c..32ac5b964f3 100644
--- a/src/lib/io/master.c
+++ b/src/lib/io/master.c
@@ -135,6 +135,8 @@ struct fr_io_connection_s {
 	fr_network_t			*nr;		//!< network for this connection
 };
 
+static void client_expiry_timer(fr_event_list_t *el, fr_time_t now, void *uctx);
+
 static fr_event_update_t pause_read[] = {
 	FR_EVENT_SUSPEND(fr_event_io_func_t, read),
 	{ 0 }
@@ -616,7 +618,20 @@ static fr_io_connection_t *fr_io_connection_alloc(fr_io_instance_t const *inst,
 
 	case PR_CLIENT_STATIC:
 	case PR_CLIENT_DYNAMIC:
-		connection->client->state = PR_CLIENT_CONNECTED;
+		{
+			fr_io_client_t *my = connection->client;
+
+			my->state = PR_CLIENT_CONNECTED;
+
+			if (fr_time_delta_ispos(my->radclient->limit.idle_timeout) &&
+			    (fr_event_timer_in(my, connection->el, &my->ev,
+					       my->radclient->limit.idle_timeout, client_expiry_timer, my) < 0)) {
+				ERROR("proto_%s - Failed adding idle timeout for client %s.  It will be permanent!",
+				      inst->app_io->common.name, my->radclient->shortname);
+				talloc_free(dl_inst);
+				return NULL;
+			}
+		}
 		break;
 
 	case PR_CLIENT_INVALID:
@@ -2142,7 +2157,7 @@ static void packet_expiry_timer(fr_event_list_t *el, fr_time_t now, void *uctx)
 	/*
 	 *	The client isn't dynamic, stop here.
 	 */
-	if (client->state == PR_CLIENT_STATIC) return;
+	if ((client->state == PR_CLIENT_STATIC) || (client->state == PR_CLIENT_CONNECTED)) return;
 
 	fr_assert(client->state != PR_CLIENT_NAK);
 	fr_assert(client->state != PR_CLIENT_PENDING);
@@ -2424,6 +2439,13 @@ static ssize_t mod_write(fr_listen_t *li, void *packet_ctx, fr_time_t request_ti
 
 		client->state = PR_CLIENT_CONNECTED;
 
+		if (fr_time_delta_ispos(client->radclient->limit.idle_timeout) &&
+		    (fr_event_timer_in(client, connection->el, &client->ev,
+				       client->radclient->limit.idle_timeout, client_expiry_timer, client) < 0)) {
+			ERROR("proto_%s - Failed adding idle timeout for client %s.  It will be permanent!",
+			      inst->app_io->common.name, client->radclient->shortname);
+		}
+
 		radclient->active = true;
 
 		/*