From 439c0ceab1317a8d33f69d6df1af70c2d8b621b4 Mon Sep 17 00:00:00 2001 From: Paul Donald Date: Fri, 3 Oct 2025 16:35:52 +0200 Subject: [PATCH] router: redefine ra_mininterval and ra_maxinterval as uint32_t MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit They never store negative values. Signed-off-by: Paul Donald Link: https://github.com/openwrt/odhcpd/pull/225 Signed-off-by: Álvaro Fernández Rojas --- src/config.c | 8 ++++---- src/odhcpd.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/config.c b/src/config.c index fa5e3ef..ae6675c 100644 --- a/src/config.c +++ b/src/config.c @@ -1428,8 +1428,8 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr uint32_t ra_mininterval = blobmsg_get_u32(c); if (ra_mininterval < MinRtrAdvInterval) ra_mininterval = MinRtrAdvInterval; // clamp min - else if (ra_mininterval > (0.75 * (uint32_t)iface->ra_maxinterval)) - ra_mininterval = 0.75 * (uint32_t)iface->ra_maxinterval; // clamp max + else if (ra_mininterval > (0.75 * iface->ra_maxinterval)) + ra_mininterval = 0.75 * iface->ra_maxinterval; // clamp max iface->ra_mininterval = ra_mininterval; } @@ -1442,8 +1442,8 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if ((c = tb[IFACE_ATTR_RA_LIFETIME])){ uint32_t ra_lifetime = blobmsg_get_u32(c); if (ra_lifetime != 0){ - if (ra_lifetime < (uint32_t)iface->ra_maxinterval) - ra_lifetime = (uint32_t)iface->ra_maxinterval; // clamp min + if (ra_lifetime < iface->ra_maxinterval) + ra_lifetime = iface->ra_maxinterval; // clamp min else if (ra_lifetime > AdvDefaultLifetime) ra_lifetime = AdvDefaultLifetime; // clamp max } diff --git a/src/odhcpd.h b/src/odhcpd.h index af4ec2e..d428fbe 100644 --- a/src/odhcpd.h +++ b/src/odhcpd.h @@ -362,8 +362,8 @@ struct interface { struct in6_addr pio_filter_addr; int default_router; int route_preference; - int ra_maxinterval; - int ra_mininterval; + uint32_t ra_maxinterval; + uint32_t ra_mininterval; uint32_t ra_lifetime; uint32_t ra_reachabletime; uint32_t ra_retranstime; -- 2.30.2