From: Max Khon <fjoe@samodelkin.net>
Date: Wed, 28 Jun 2023 04:35:48 +0000 (+0700)
Subject: lua_release_cmd: always reset expiry time (for static leases too)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aac137772c0b1f850abd2fdb182b8d8c7f5bf4fb;p=thirdparty%2Ffreeradius-server.git

lua_release_cmd: always reset expiry time (for static leases too)
---

diff --git a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
index 47adef56b56..4196426ffb4 100644
--- a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
+++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
@@ -460,16 +460,17 @@ static char lua_release_cmd[] =
 	"end" EOL									/* 14 */
 
 	/*
-	 *	Set expiry time to now() - 1 if it is not static
+	 *	Set expiry time to now() - 1
 	 */
 	"pool_key = '{' .. KEYS[1] .. '}:"IPPOOL_POOL_KEY"'" EOL			/* 15 */
 	"found = tonumber(redis.call('ZSCORE', pool_key, ARGV[2]))" EOL			/* 16 */
-	"if found < " STRINGIFY(IPPOOL_STATIC_BIT) " then" EOL				/* 17 */
-	"  redis.call('ZADD', pool_key, 'XX', ARGV[1] - 1, ARGV[2])" EOL		/* 18 */
+	"local static = found > " STRINGIFY(IPPOOL_STATIC_BIT) EOL			/* 17 */
+	"redis.call('ZADD', pool_key, 'XX', ARGV[1] - 1 + (static and " STRINGIFY(IPPOOL_STATIC_BIT) " or 0), ARGV[2])" EOL		/* 18 */
 
 	/*
 	 *	Remove the association between the device and a lease
 	 */
+	"if not static then" EOL							/* 18 */
 	"  owner_key = '{' .. KEYS[1] .. '}:"IPPOOL_OWNER_KEY":' .. ARGV[3]" EOL	/* 19 */
 	"  redis.call('DEL', owner_key)" EOL						/* 20 */
 	"end" EOL									/* 21 */