From aa4f26232e058ee4684afc222efa70964a3d5d0e Mon Sep 17 00:00:00 2001 From: Paul Donald Date: Thu, 9 Oct 2025 23:35:31 +0200 Subject: [PATCH] router: refactor calc_ra_lifetime; redefine ra_lifetime as uint32_t MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit ra_lifetime no longer holds negative values, because we no longer do 'init' when we do calc_ra_lifetime, instead we do init at init time. Now ra_lifetime holds only >0 values. Signed-off-by: Paul Donald Link: https://github.com/openwrt/odhcpd/pull/225 Signed-off-by: Álvaro Fernández Rojas --- src/odhcpd.h | 2 +- src/router.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/odhcpd.h b/src/odhcpd.h index be80646..af4ec2e 100644 --- a/src/odhcpd.h +++ b/src/odhcpd.h @@ -364,7 +364,7 @@ struct interface { int route_preference; int ra_maxinterval; int ra_mininterval; - int ra_lifetime; + uint32_t ra_lifetime; uint32_t ra_reachabletime; uint32_t ra_retranstime; uint32_t ra_hoplimit; diff --git a/src/router.c b/src/router.c index c352d19..fd8e9e3 100644 --- a/src/router.c +++ b/src/router.c @@ -363,7 +363,7 @@ static uint32_t calc_ra_lifetime(struct interface *iface, uint32_t maxival) { uint32_t lifetime = iface->max_preferred_lifetime; - if (iface->ra_lifetime >= 0) { + if (iface->ra_lifetime > 0) { lifetime = iface->ra_lifetime; } -- 2.30.2