From patchwork Thu May 9 22:30:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Donald X-Patchwork-Id: 1933669 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=hQiaHr6Y; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256 header.s=casper.20170209 header.b=SZpUpOVq; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=KWadezBo; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Vb6Jm5nM6z214W for ; Fri, 10 May 2024 08:34:47 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=LDhm96pC1bYgJ153YaKSwrGsPkX3OUaUgWNLeUbFyBM=; b=hQiaHr6YPNtuZr QdhEwaKWdPMLrLcyUo7B1L24Po+x0Jf0wHOWTwQYeboGP7j10+RVwbppSQbgJxy5B3+oRo2+zDa7i V75ZibxEgj5CGP6arc4T9D4hihCWRMdzMJzXk9k/RP+YRId35eZs0j+pSNvt+K/v4pver6AUQ3nVI iJ6l+bdz6l08Rn3htsq945iZDRrBbtzSpjVEPxAMydFc4Vy6RE8v02fHMj7EFy2A25wIVlgDd742M M05BmbCv4Hi+VR4Ok99kGvvok/bxbnBGLGai7HD/uGumBit0yfhdzUxp4UFP+lcKEhjp4th6/qiJw mmX56yCeH3s/0z2SHgNg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CJi-00000003717-3NTi; Thu, 09 May 2024 22:32:46 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CJX-000000036u3-0B2P for openwrt-devel@bombadil.infradead.org; Thu, 09 May 2024 22:32:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description; bh=waGieEAcD66Vj8ALj0wHlFdupdJL2HBFsNj0mZskYIQ=; b=SZpUpOVq+8Q1L1kb3BuOfFUnCS /STNzJE/0GoOs4puG9xLa5W5G2Edbf4HdOfbryXXe70Rg3qEU7CEl/JbOI0hz4E8JeN/FAKEDN1kw KrXzvN+P8MSi8Exg1RgZFX59uYotE4F1UeR2D7Z21PxbmCiR12KQqxWzQBwdT5Y8gvHJmGuZopbXW GQV18+cOHwH828gtdjd1kKhS3cjPUw/mb4xJvRaZ37iphDWNaFFml2771gBxBqDUg3bjUIj+hAGNl nC3jDJBvaSQ5dpLr9Zg2km1aH+K8q7Lhv9qOZQdCA7h9RdCpm/W6/6yqtXXVajmnzBlDjlnLLMBb7 O79zbp3A==; Received: from mail-lj1-x22b.google.com ([2a00:1450:4864:20::22b]) by casper.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CJR-00000001aJh-0IxF for openwrt-devel@lists.openwrt.org; Thu, 09 May 2024 22:32:33 +0000 Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2e09138a2b1so15195351fa.3 for ; Thu, 09 May 2024 15:32:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715293938; x=1715898738; darn=lists.openwrt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=waGieEAcD66Vj8ALj0wHlFdupdJL2HBFsNj0mZskYIQ=; b=KWadezBoGCo9TuXJmo4k6tvP7LpY4ynOkc+6VvPRJRka6kW+9OYymCll84hOIpQ58a lcz1UzgRJzEG89UaH4MNC953aEDJWs1hFETt4+vZL9OF7tUZ1HJnXr0pRmigI9BSRSiU V/FA7fUgyBTx7jAdJFW9jUJno106BD9+iWvls195CA/Ugj8yxNvn8FoPLM868zbw9GeC Pdpy/k8leWrRjgBZ4gwK3qa1Wq9C6KPJVC/rn6HLyBak4VvU5Z5SwB7QTpc0K88ANAFx rUdYnl2yABP3imt1cgFP8rOCqCexF2975GYW7HdR1wJofgdC7SMBitJKt8gFOHpJyHeg KDVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715293938; x=1715898738; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=waGieEAcD66Vj8ALj0wHlFdupdJL2HBFsNj0mZskYIQ=; b=sQoZEihvmM5Sp+IdLwFRkxaWJGZ6YqwUKhBDMDSlKNo+91YlVZ5YZa/0upnAEnljNu Ef4NrMLrYwyP5ppJnPHyrTaa2FK9zG6qHjbBvX/hZmZsxSdk7Mm8po7CRHqYcsCaWRd5 lUeVlois6vfiPMDP76tcy8IjN18DIyV213R/C4WeokTceaP3rIelvvJIMwGgwfQTv8Nl nY0KO0AY3Zkg+YgfLlkdcqMnRNLfi8dkWaZ9YzIPVdg/RN9gVa9fz0rLQAZ0aj+KyaXI T8ePHhDBQdTqMb+sxfGAeBk0whrGVKv2yUjS10hSKwDIpSClLeIh/rZvFYr7zT+jrMPB F90g== X-Gm-Message-State: AOJu0YxeywbQWxVmurkhR2UWYjX5RD6/86hy091krB+49WMsX1BZhANk XFr6hrjEyyiOlWLXg5H8uUy+S52v7+qwXaZeSGzMODoHaFhVIIjK1aSfrQ== X-Google-Smtp-Source: AGHT+IGO41Fce+Kb5/8s5BmTY02aLG/QLKoGcLO03byx4Tn8bTNqLrcAW11gE+bIN8kZwtqwKn2U8g== X-Received: by 2002:a2e:8ec4:0:b0:2dd:97e:3481 with SMTP id 38308e7fff4ca-2e5205f6f3amr3953151fa.51.1715293937596; Thu, 09 May 2024 15:32:17 -0700 (PDT) Received: from blackhol3 ([2001:9b0:40::cae3:cb03]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e4d0bbc3a6sm3156191fa.13.2024.05.09.15.32.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 15:32:17 -0700 (PDT) From: Paul Donald To: OpenWrt Development List Subject: [RFC PATCH 05/14] router: redefine ra_mininterval and ra_maxinterval as uint32_t Date: Fri, 10 May 2024 00:30:37 +0200 Message-ID: <20240509223213.97389-6-newtwen+github@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240509223213.97389-1-newtwen+github@gmail.com> References: <20240509223213.97389-1-newtwen+github@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240509_233229_228821_83D587C8 X-CRM114-Status: GOOD ( 11.52 ) X-Spam-Score: -2.1 (--) X-Spam-Report: SpamAssassin version 4.0.0 on casper.infradead.org summary: Content analysis details: (-2.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [newtwen+github(at)gmail.com] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:22b listed in] [list.dnswl.org] X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Paul Donald They never store negative values. Signed-off-by: Paul Donald --- src/config.c | 6 +++--- src/odhcpd.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config.c b/src/config.c index 2ccf742..a3bf1ba 100644 --- a/src/config.c +++ b/src/config.c @@ -991,8 +991,8 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if ((c = tb[IFACE_ATTR_RA_MININTERVAL])){ uint32_t ra_mininterval = blobmsg_get_u32(c); iface->ra_mininterval = (ra_mininterval < MinRtrAdvInterval_FLOOR) ? // clamp min - MinRtrAdvInterval_FLOOR : (ra_mininterval > 0.75 * (uint32_t)iface->ra_maxinterval) ? // clamp max - 0.75 * (uint32_t)iface->ra_maxinterval : ra_mininterval; + MinRtrAdvInterval_FLOOR : (ra_mininterval > 0.75 * iface->ra_maxinterval) ? // clamp max + 0.75 * iface->ra_maxinterval : ra_mininterval; } /* @@ -1004,7 +1004,7 @@ 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); iface->ra_lifetime = (ra_lifetime == 0) ? 0 : // leave at 0 - (ra_lifetime < (uint32_t)iface->ra_maxinterval) ? (uint32_t)iface->ra_maxinterval : // clamp min + (ra_lifetime < iface->ra_maxinterval) ? iface->ra_maxinterval : // clamp min (ra_lifetime > AdvDefaultLifetime_CEILING) ? AdvDefaultLifetime_CEILING : ra_lifetime; // clamp max } diff --git a/src/odhcpd.h b/src/odhcpd.h index 09cd4f1..fecd77e 100644 --- a/src/odhcpd.h +++ b/src/odhcpd.h @@ -312,8 +312,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;