Skip to contentSkip to conversation

dhcp-server: Simplify timeout handling

PATCH Applied Andrew Zaborowski 2 participants 2 messages Jun 10, 2021 – Jun 11, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dhcp-server: Simplify timeout handling

Remove max timeout interval checks no longer useful after the l_timeout_modify_ms() parameter type change.

---
 ell/dhcp-server.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)
ell/dhcp-server.c +2 -13
index b58b2f6..34512ae 100644
@@ -225,15 +225,9 @@ static void set_next_expire_timer(struct l_dhcp_server *server,
 		uint64_t expiry = get_lease_expiry_time(next);
 		uint64_t now = l_time_now();
 		uint64_t next_timeout = l_time_after(expiry, now) ?
-			expiry - now : 0;
-		uint64_t next_timeout_ms = l_time_to_msecs(next_timeout) ?: 1;
+			l_time_to_msecs(expiry - now) : 0;
 
-		if (L_WARN_ON(next_timeout_ms >
-					server->lease_seconds * L_MSEC_PER_SEC))
-			next_timeout_ms =
-				server->lease_seconds * L_MSEC_PER_SEC;
-
-		l_timeout_modify_ms(server->next_expire, next_timeout_ms);
+		l_timeout_modify_ms(server->next_expire, next_timeout ?: 1);
 	} else
 		server->next_expire = l_timeout_create(
 						server->lease_seconds,
@@ -246,11 +240,6 @@ static void lease_expired_cb(struct l_timeout *timeout, void *user_data)
 	struct l_dhcp_server *server = user_data;
 	struct l_dhcp_lease *lease = l_queue_peek_tail(server->lease_list);
 
-	if (!is_expired_lease(lease)) {
-		set_next_expire_timer(server, NULL);
-		return;
-	}
-
 	if (server->event_handler)
 		server->event_handler(server, L_DHCP_SERVER_EVENT_LEASE_EXPIRED,
 					server->user_data, lease);
Signature · 1 line
2.30.2
#1 lore raw

Hi Andrew,

Quoted 6 lines · Andrew Zaborowski

Remove max timeout interval checks no longer useful after the l_timeout_modify_ms() parameter type change.

---
  ell/dhcp-server.c | 15 ++-------------
  1 file changed, 2 insertions(+), 13 deletions(-)

Applied, thanks.

Regards,
-Denis