From patchwork Thu May 9 22:30:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Donald X-Patchwork-Id: 1933675 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=cp0o8lV2; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256 header.s=desiato.20200630 header.b=Bt+yvC65; 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=iv1Wo39d; 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 4Vb6KN0ldyz20fh for ; Fri, 10 May 2024 08:35:20 +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=CAk1ZXHUURh3mfcVlEZfm7kqA1Bwt31NGjj5ATd3oho=; b=cp0o8lV2SmmbcW bhOcYhBzB+NmeDgjEiAoZfUipOEHFcWjRn5AeZjiSfF1ppOs4HaT1j399TxdgZB7OMGU/pBrvAmIf CsCZItG5fuWZUo9X6SH01TmLsz2bbyOakZ2x/nhPOLl1dQ/r4zStGPzGwh7SOVhyapQ6rpUu8elY+ 7fJY2Qbw6qvX91QEXMnBc++giT7FEhUTTqwlO+xlZ4NlPB5p7epAP+pWbMyn74Md3APvvHEmi5dOn tD06uV7r8vkjL8Ru2uYgLe7jf9edYyTBGhkN0tBF8RJ0GDqTqFvqlQPHk7ek+vYlXa8RCscJ9PSbv 7wWBgQw+De+EFskeBqcg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CK2-000000037BZ-2Ras; Thu, 09 May 2024 22:33:06 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CJX-000000036uJ-3eGh 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=desiato.20200630; 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=1851bva9I3Ea2O0o5M9rBH6ihz6ynT0wg8vx05ZmHb4=; b=Bt+yvC65NbobXbwOFjfNeIw8FG a+9BnJIe0p/kh5CbGOHLHQzy27IaQqEpJ+G1ri8Du6wJ8fFpHcCJ9Z3GVVZyQ58RQlUX7WT2FnB99 +2Bg7ncFNVUuf/jlfHC+5lV+hn6E/qFy8ibcgGqNq8VtVNtX+58yjuk1JST4pCU6MNwQ7dywE4Njv IHsZ8PLBkwhsj6KdgpMeLp8FsL07xn8rMHLtzbMAb8dV8RT469BHMKyhQe9xWaCx4uakb+hvkUxDi sc97ItWOHml44eTLW2GejIDgBlkaCp8EnfmjZeDJt9FXXJHS2SdQp26n2REATV56Gq0lQqf3ACPUI 7Pge2vxA==; Received: from mail-lj1-f172.google.com ([209.85.208.172]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CJP-000000034Fl-0jCF for openwrt-devel@lists.openwrt.org; Thu, 09 May 2024 22:32:33 +0000 Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2e3f6166e4aso24605861fa.1 for ; Thu, 09 May 2024 15:32:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715293936; x=1715898736; 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=1851bva9I3Ea2O0o5M9rBH6ihz6ynT0wg8vx05ZmHb4=; b=iv1Wo39dAwF2upIaDydyng5ndTNPCjdIZKti7izXfE6yuONiEMhK6xJsPEYqwbGyMc 6Ki8bb8rxIse5/MVthvR4fVBMVaAE3ndFvqLIwI9MPsreYIUyJHNpBCoj7pC6NGHEn8I bDcSy1MT/qI3rwJefeXBlBmQWSJIgOuGzzYFycIZUG+13tu7XrKoa7KSaT1YmKGB4BC2 hDpQCwc5tTIHkaL/I/F+VO/wHQw0Mnh+hrqOCbqr4i3JE7WxnDd1aujmiZCJrhYpuRls RMYU8Cxs9YVAT+Q6jZ/leiuZ1EBQdzehGaeAMs/gbgcVauZlExOoh3+a+Re4tvJ4Vput XxQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715293936; x=1715898736; 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=1851bva9I3Ea2O0o5M9rBH6ihz6ynT0wg8vx05ZmHb4=; b=muyQWlwhHTs3E9fwdJeEx6poG+6VK/l/5/CKOCZJpShdGPjTdyreHAdSONBBwisMw4 NTeNm+uLt7IL4gRpJRXaOciiUYYikWXCY5YlnsKVfU799g0hL/Hn+a/AmrOHZRLFI1FZ G/6HA2m0e1Bt9ctvJKIyF8qtgO95R2bP2TOxL8iwWzav12/6RSd7La6fqkEjP+xT9a/1 uAE6loWRQYDRemxcWSEaY3+uEZQP+Xv6La42Dv6U8QEpTMQG1NSb2g1XqngIboo4b862 C/9SSrKDoOlKAstpK+OwuwPj22P3TQfq2+41T2ghXSBkTidRwi9+thnCOQse+OEHiRgV NnIg== X-Gm-Message-State: AOJu0YxPEIgAWRno/BqSEuyRubHElcW5Co4Qif0xpr0yYeF7zAui2uOc l1Aj+jAn/cn3ulA3oHmxOpKB+jv0jUyihdHzjLkRA34K85WW9poeRaHcUg== X-Google-Smtp-Source: AGHT+IHQFpZHNgjpoB8ClxYpVLvrVeEHxHdVvtDy0Iag7sb3ExITvgHBEq6T/aklkJkjoOd3O/B3tA== X-Received: by 2002:a2e:808e:0:b0:2da:7cd1:3f1f with SMTP id 38308e7fff4ca-2e52039e2b7mr4742411fa.52.1715293935522; Thu, 09 May 2024 15:32:15 -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.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 15:32:15 -0700 (PDT) From: Paul Donald To: OpenWrt Development List Subject: [RFC PATCH 01/14] config: refactor parse_leasetime() - branch amount remains same Date: Fri, 10 May 2024 00:30:33 +0200 Message-ID: <20240509223213.97389-2-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_233228_980439_250B5DC7 X-CRM114-Status: GOOD ( 10.40 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "desiato.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Paul Donald Also make 's' value a noop. Signed-off-by: Paul Donald --- src/config.c | 20 ++++++++ 1 file changed, 8 insertions(+), 12 deletions(-) Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.172 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -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 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 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 [209.85.208.172 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 Also make 's' value a noop. Signed-off-by: Paul Donald --- src/config.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/config.c b/src/config.c index 62d4857..346d74a 100644 --- a/src/config.c +++ b/src/config.c @@ -356,18 +356,14 @@ static double parse_leasetime(struct blob_attr *c) { double time = strcmp(val, "infinite") ? strtod(val, &endptr) : UINT32_MAX; if (time && endptr && endptr[0]) { - if (endptr[0] == 's') - time *= 1; - else if (endptr[0] == 'm') - time *= 60; - else if (endptr[0] == 'h') - time *= 3600; - else if (endptr[0] == 'd') - time *= 24 * 3600; - else if (endptr[0] == 'w') - time *= 7 * 24 * 3600; - else - goto err; + switch(endptr[0]) { + case 's': break; + case 'm': time *= 60; break; + case 'h': time *= 3600; break; + case 'd': time *= 24 * 3600; break; + case 'w': time *= 7 * 24 * 3600; break; + default: goto err; + } } if (time < 60) From patchwork Thu May 9 22:30:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paul Donald X-Patchwork-Id: 1933673 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=zGBYCJBS; 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=a7lZ6hK3; 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=RZmzgElp; 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 4Vb6KL31b9z20fh for ; Fri, 10 May 2024 08:35:18 +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-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-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=6xCTBJmfQ8x75oFkeg/tpDwQF7spIYBkDncTY3fntc0=; b=zGBYCJBSSp1I7rPIlPPaSasj/r n23NHDO+sPaRhcv77Nf7/FPRh1vPe3QnQ/WR5EA/tEGmAOAqRFXz/+Zqxa8QrgQ6y3Cp6XLC8WL0T Y74IUfd5dyeFNL8aX+uSb5hlgHAJ7hBqfU5mGKC4L2Ax5gRnyvdaYf+ZDa5HZz3vKBs95ViNnCcIm 69k3jXa48Z3nxpxLYZwX+7TraP/sWaJ2raiMLbMpRc4sIVehKQJ5kXjE9hIPU6s4jl4yVS8Dwg/Cm Mz508CaJOhnCRmR+vU42DnuxQ3fOqQGRr1rIKCUsmGbfH4DZ5zk9fs68D81TTbZ/XTJS12yPMDssR SY+nxavg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CKB-000000037HM-3xDp; Thu, 09 May 2024 22:33:15 +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 1s5CJY-000000036v5-0dN2 for openwrt-devel@bombadil.infradead.org; Thu, 09 May 2024 22:32:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description; bh=kAlChu7qrixtOfbZAKh+/5U0flrpg3ISmtEN5paw4QI=; b=a7lZ6hK3w3YcSJvvRg5BEQVegf TxREpcPJjJcteScfDyhCoeikQoYgC7jl63XEC4jsU2XhS6XWMFCpdwSYPqzpHa9IxjPjBvVuottI3 6gFrs1tNSqN4+anSo2qF9O+3T41KcooYr7wGAnSFeEDW6fAXCd9XI+qRsLaF4eKqpUXAmIXrfLa+T hVOSpqhF1Al5l7Os6Q6kOJ2YuU5lSFnYrIaya/70YWpdP7MiT1f8qC3LqU21AtqQqxAtSYMzYXl7I pCgt68PqFPzNNSVwGGwp1HbFLa6qQChgP7XAPA4Yj14QURWY77DMrbchioDMEcgrx/1Ve2p1SzQA8 /oIDxOrw==; Received: from mail-lj1-x22e.google.com ([2a00:1450:4864:20::22e]) by casper.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CJR-00000001aJZ-0J9c for openwrt-devel@lists.openwrt.org; Thu, 09 May 2024 22:32:34 +0000 Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2e521817c1fso4924911fa.0 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=1715293936; x=1715898736; 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=kAlChu7qrixtOfbZAKh+/5U0flrpg3ISmtEN5paw4QI=; b=RZmzgElpJcWBOUC2xlzIQEsm65UmFXCqF1TqNekTS7p1nlpd8rxMvmrJG6tBq4wzTW DYW6nVSQY4NCAEn7NZl/uP1KMPA8w8M+WdS3ogqgZMsuHO0KE+kuc1DWl7eihGUKcWtS Uiv1Z4h8rildpU25GPRXAIAwtQoC4qmven6o/hYlrdosT+ZP3FSY8T+c57RAHuNclJMB NKrxee4dA73c5ThigM+Vj83JQaeivwPhT14i+jRz9nMAoANYhWygWlHl1YvcCHeSHhr2 6pUYZGVUPg6rUbYHhVsOszl1kwG/53gW32D/fdf/kvWNaXhKai/1MU9ew2RemMXce6Ji d+9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715293936; x=1715898736; 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=kAlChu7qrixtOfbZAKh+/5U0flrpg3ISmtEN5paw4QI=; b=vdp8tawwB2xQBMsYOL7vwZr4j5xZGbZlfOAV+QzhVTJ2YHJ4uytAZiR5G6/b+YT1hX /AiIxM2HsXzIpSqqd+QUugaDDxAr0jtTKd/h3lTrzz+QOEOdLE+IhxLLf07XB0g3cJEn BV0f08zv4nn9S/5FnL+9/R3Du/j7n5FHL+KiKSjBJQEjKRs81B3Jbw06iZ7U2nXkk+XY COTmpBR3lI/zGQmHBNH6IwAYV2RE5znD7sLB7PgyLUKLsI6FPh7PZIRgs0kSYg/eGUme P1E8TUEKfx8Yj+Oo9wOaz/19LEuAS6iz7+BHLAavkxBKjfUOnImRMDrmHP4GGHQJEjCP AgkQ== X-Gm-Message-State: AOJu0YwTEFO7j7V/LnpE1OL1QT4dXF28ZRTu7GvYbLR/kWS5IDwl90rw nbHznMYlVXcJt//DT2CJAT778MoyoP7EebkkzPOQ6r0ok5V+NU+Oc1OEkg== X-Google-Smtp-Source: AGHT+IF400bgLpMdnMEa/i+sQxivZlaDE6YYR8zd+ogtK0htD/acHBUibZGrJ6LCDa1XCi19LTYwQg== X-Received: by 2002:a2e:e02:0:b0:2d4:54f2:c409 with SMTP id 38308e7fff4ca-2e52028d78emr4018621fa.38.1715293936199; Thu, 09 May 2024 15:32:16 -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.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 15:32:15 -0700 (PDT) From: Paul Donald To: OpenWrt Development List Subject: [RFC PATCH 02/14] router: Apply updated values from RFC8319 (updates RFC4861) to RA/ND Date: Fri, 10 May 2024 00:30:34 +0200 Message-ID: <20240509223213.97389-3-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_226256_8D37C5F1 X-CRM114-Status: GOOD ( 12.76 ) 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:22e 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 https://www.rfc-editor.org/rfc/rfc8319#section-4 Signed-off-by: Paul Donald --- src/router.c | 6 ++++-- src/router.h | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/router.c b/src/router.c index 7f5658b..ae0c545 100644 --- a/src/router.c +++ b/src/router.c @@ -382,8 +382,10 @@ static uint32_t calc_ra_lifetime(struct interface *iface, uint32_t maxival) lifetime = iface->ra_lifetime; if (lifetime > 0 && lifetime < maxival) lifetime = maxival; - else if (lifetime > 9000) - lifetime = 9000; + /* // RouterLifetime is a 16 bit packet field: skip this check + else if (lifetime > RouterLifetime_MAX) + lifetime = RouterLifetime_MAX; + */ } return lifetime; diff --git a/src/router.h b/src/router.h index 0444da8..1f8d156 100644 --- a/src/router.h +++ b/src/router.h @@ -32,8 +32,29 @@ struct icmpv6_opt { #define MaxInitialRtrAdvInterval 16 #define MaxInitialRtAdvs 3 -#define MaxRtrAdvInterval 1800 +/* RFC8319 §4 + This document updates §4.2 and 6.2.1 of [RFC4861] to change + the following router configuration variables. + + In §6.2.1, inside the paragraph that defines + MaxRtrAdvInterval, change 1800 to 65535 seconds. + + In §6.2.1, inside the paragraph that defines + AdvDefaultLifetime, change 9000 to 65535 seconds. +*/ +#define MaxRtrAdvInterval_CEILING 65535 #define MinRtrAdvInterval 3 +#define AdvDefaultLifetime_CEILING 65535 +/* RFC8319 §4 + This document updates §4.2 and 6.2.1 of [RFC4861] to change + the following router configuration variables. + + In §4.2, inside the paragraph that defines Router Lifetime, + change 9000 to 65535 seconds. + + Note: this is 16 bit Router Lifetime field in RA packets +*/ +#define RouterLifetime_MAX 65535 #define ND_RA_FLAG_PROXY 0x4 #define ND_RA_PREF_HIGH (1 << 3) From patchwork Thu May 9 22:30:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paul Donald X-Patchwork-Id: 1933674 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=mXRFDCCn; 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=ZlSfaI/z; 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=l5R2xioI; 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 4Vb6KL5wFWz213s for ; Fri, 10 May 2024 08:35:18 +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-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-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=aqu8u/AFqTRDvgH7Yd2V2PiPybzYjuIgY0lxHMpiwi8=; b=mXRFDCCnK6UOSGvokicfQIVawp yeQGAlonFOyc3y0U/x7U2q/zuFnum38340tucqxXBbQrsr6BgEmDeiNRx5mTbY56nWP4isv6YorhU 0+GrCXcHQIvBAncqBNZevXpe3bggoRKSFvDxSjiFzqLuFnzj/CAuO+tYhXWMVMsTsdN5LNtNwGY6u SUyZ91OZPvZXxxbHhkjqSilXqa/k7w4ooSPZaTOC/PQNgoko7IPXNCLi2PbbitNVXDKaMDMkWJDXx lgD4MMqBAayliO3kAUz1520C8CVckyRFbUTIJt33tZiMtLqFOCDLZzLBQTZR+HhbOl01Y3MDaGKho QJuaqXDg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CL4-000000037vX-3LwV; Thu, 09 May 2024 22:34:10 +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 1s5CJa-000000036xA-1BUj for openwrt-devel@bombadil.infradead.org; Thu, 09 May 2024 22:32:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description; bh=d0/N1ik9IYwlEjVcfEc4qWIVLYLmEU3g6186lV+8218=; b=ZlSfaI/zDT0GlMjgEa650z/jZY ZRU2xb+US7G8EhoZerZTF3S2k6DlBHljxypt1n7p4nX0ObaUENC4DWJS7cnKnK5ZDP+U4q512arU/ O3oKW5DUnt6mUe0LqGv1pWHwAe/blo6WZaOrMxvjlHy0G0hNaLBIegMGZevh3gS39x1mJIYG76Giy 23JaJdnI8EatSUQI4q0EKyUE1YWaEXWV/af1DiWZ3aDiw85rS5i37ZKUQS9MflX1ZYhYY4xvLUGHt NJDUOWacAKpXss6i4cnYQmGZVht5J11rUzyqswJSWH04fU3vMIP3wj+mNvlZcLWxafQvBtnE5dVIi a8Fz7OAw==; Received: from mail-lj1-x233.google.com ([2a00:1450:4864:20::233]) by casper.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CJR-00000001aJe-0IsI for openwrt-devel@lists.openwrt.org; Thu, 09 May 2024 22:32:37 +0000 Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2e1fa824504so18175601fa.0 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=1715293937; x=1715898737; 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=d0/N1ik9IYwlEjVcfEc4qWIVLYLmEU3g6186lV+8218=; b=l5R2xioIwNzJKa6Xg/V8AeDtqw8lKz4tLSyNRoVUVdwzZAANwe0ubAuyI25D6RWLDC bHP18sQ+++dTgY+miJHVt2ZjgIASqWyi6WWI5eRHZkEI4hv9YR0vsBH2WvvPhpDB/hUR rNDoy4OC6wUGRD8WE6lgQRGNZQVEDZBBq2hAjSTFtXndzztRT+WSloi9nFxNsvx3mpsM BSEiaB3pW4DLMNonM7LMxpHh6Iud8kot1smUmdxEJUe/+ZtWlS89O08nm++oviigh4nz Gc+yN+5Tr24qZFssRvErKk694qhwO2TadqRR5KTsKC/NyM8/TXWNBwccqhiQazQNDnOw I+1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715293937; x=1715898737; 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=d0/N1ik9IYwlEjVcfEc4qWIVLYLmEU3g6186lV+8218=; b=X+5vBml0PftTqjZrheZKTt7zLLeLFGDnf84Q+6rDjSsfmOt8IVrQjZWWpo5nas2bph UWPKlo6skKf2YUkM6iZD+gCfho65l9vbMEB+w8lf1jo2BpSmqMs6QCBASEavuREl/YzX EWGD1OT5Zuc6SnOsYa+cwMeNul3pT59O01e+rQXZOT3cX/uoJ7puG6fiJxoTK44dWXzK LiXv4oeuUczcX/EdWp/l5xxtv+oAfM6NFb0Uovd3CvuAPn4hb+Q6MvhBDv4yOSzpPHsf 7y8/Kx1n/fOm/8fhg0nBCN77xng9SjhAyw3/12cntDDyrfzIKdnMZPrO331TImhfwGTU j5YA== X-Gm-Message-State: AOJu0YzAqPUK2QGL8i0DrDB3AxylcsFZHB8LkIGpPsOzyb9JCIeLghj+ JRw4Sn/MGjuC2qrTfXojlis3uNbJbS+b0jtPHzIE5fUuFFX0gy903WDMpg== X-Google-Smtp-Source: AGHT+IHH5rrXUUsPupKEhKhzC64w+b696RaeafwFQGeGijCyPpwB+pQheOZgvxnms0iGSdCvGXNZkA== X-Received: by 2002:a2e:9ed5:0:b0:2e0:e129:7011 with SMTP id 38308e7fff4ca-2e51ff4d5ecmr3903621fa.16.1715293936707; Thu, 09 May 2024 15:32:16 -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.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 15:32:16 -0700 (PDT) From: Paul Donald To: OpenWrt Development List Subject: [RFC PATCH 03/14] config: clamp ra_mininterval, ra_maxinterval, ra_lifetime at load time Date: Fri, 10 May 2024 00:30:35 +0200 Message-ID: <20240509223213.97389-4-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_283921_F7E8F846 X-CRM114-Status: GOOD ( 15.19 ) 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:233 listed in] [list.dnswl.org] 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] 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 Signed-off-by: Paul Donald --- src/config.c | 48 +++++++++++++++++++++++++++++++++++++++++------- src/router.c | 10 ---------- src/router.h | 2 +- 3 files changed, 42 insertions(+), 18 deletions(-) diff --git a/src/config.c b/src/config.c index 346d74a..2ccf742 100644 --- a/src/config.c +++ b/src/config.c @@ -18,6 +18,7 @@ #include #include "odhcpd.h" +#include "router.h" static struct blob_buf b; static int reload_pipe[2] = { -1, -1 }; @@ -227,8 +228,12 @@ static void set_interface_defaults(struct interface *iface) iface->ra_flags = ND_RA_FLAG_OTHER; iface->ra_slaac = true; iface->ra_maxinterval = 600; + /* + * RFC4861: MinRtrAdvInterval: Default: 0.33 * MaxRtrAdvInterval If + * MaxRtrAdvInterval >= 9 seconds; otherwise, the Default is MaxRtrAdvInterval. + */ iface->ra_mininterval = iface->ra_maxinterval/3; - iface->ra_lifetime = -1; + iface->ra_lifetime = 3 * iface->ra_maxinterval; /* RFC4861: AdvDefaultLifetime: Default: 3 * MaxRtrAdvInterval */ iface->ra_dns = true; } @@ -966,14 +971,43 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if ((c = tb[IFACE_ATTR_RA_ADVROUTER])) iface->ra_advrouter = blobmsg_get_bool(c); - if ((c = tb[IFACE_ATTR_RA_MININTERVAL])) - iface->ra_mininterval = blobmsg_get_u32(c); + /* + * RFC4861: MaxRtrAdvInterval: MUST be no less than 4 seconds and no greater than 1800 seconds. + * RFC8319: MaxRtrAdvInterval: MUST be no less than 4 seconds and no greater than 65535 seconds. + * Default: 600 seconds + */ + if ((c = tb[IFACE_ATTR_RA_MAXINTERVAL])){ + uint32_t ra_maxinterval = blobmsg_get_u32(c); + iface->ra_maxinterval = (ra_maxinterval < 4) ? 4 : + (ra_maxinterval > MaxRtrAdvInterval_CEILING) ? + MaxRtrAdvInterval_CEILING : ra_maxinterval; + } - if ((c = tb[IFACE_ATTR_RA_MAXINTERVAL])) - iface->ra_maxinterval = blobmsg_get_u32(c); + /* + * RFC4861: MinRtrAdvInterval: MUST be no less than 3 seconds and no greater than .75 * MaxRtrAdvInterval. + * Default: 0.33 * MaxRtrAdvInterval If MaxRtrAdvInterval >= 9 seconds; otherwise, the + * Default is MaxRtrAdvInterval. + */ + 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; + } - if ((c = tb[IFACE_ATTR_RA_LIFETIME])) - iface->ra_lifetime = blobmsg_get_u32(c); + /* + * RFC4861: AdvDefaultLifetime: MUST be either zero or between MaxRtrAdvInterval and 9000 seconds. + * RFC8319: AdvDefaultLifetime: MUST be either zero or between MaxRtrAdvInterval and 65535 seconds. + * Default: 3 * MaxRtrAdvInterval + * i.e. 3 * 65535 => 65535 seconds. + */ + 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 > AdvDefaultLifetime_CEILING) ? + AdvDefaultLifetime_CEILING : ra_lifetime; // clamp max + } if ((c = tb[IFACE_ATTR_RA_USELEASETIME])) iface->ra_useleasetime = blobmsg_get_bool(c); diff --git a/src/router.c b/src/router.c index ae0c545..96237d6 100644 --- a/src/router.c +++ b/src/router.c @@ -350,16 +350,6 @@ static int calc_adv_interval(struct interface *iface, uint32_t lowest_found_life if (*maxival > lowest_found_lifetime/3) *maxival = lowest_found_lifetime/3; - if (*maxival > MaxRtrAdvInterval) - *maxival = MaxRtrAdvInterval; - else if (*maxival < 4) - *maxival = 4; - - if (minival < MinRtrAdvInterval) - minival = MinRtrAdvInterval; - else if (minival > (*maxival * 3)/4) - minival = (*maxival >= 9 ? *maxival/3 : *maxival); - odhcpd_urandom(&msecs, sizeof(msecs)); msecs = (labs(msecs) % ((*maxival != minival) ? (*maxival - minival)*1000 : 500)) + minival*1000; diff --git a/src/router.h b/src/router.h index 1f8d156..8e9499e 100644 --- a/src/router.h +++ b/src/router.h @@ -43,7 +43,7 @@ struct icmpv6_opt { AdvDefaultLifetime, change 9000 to 65535 seconds. */ #define MaxRtrAdvInterval_CEILING 65535 -#define MinRtrAdvInterval 3 +#define MinRtrAdvInterval_FLOOR 3 #define AdvDefaultLifetime_CEILING 65535 /* RFC8319 §4 This document updates §4.2 and 6.2.1 of [RFC4861] to change From patchwork Thu May 9 22:30:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Donald X-Patchwork-Id: 1933676 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=P03Pbdeb; 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=WC/rMRuJ; 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=ka8MrV4R; 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 4Vb6Kg28xbz20fh for ; Fri, 10 May 2024 08:35:35 +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=CdduIjuWxQd3eP2w/2h9B808rWFB4J2kav5IAmYdDMA=; b=P03PbdebLCXkHH r5v7xSMBfuQMXV7kQ8tckDbLR8VZyFFXdvAxMjqcu291mRSfdGxUA3s+TRhd8ebnw+j2p/QLV29np BMn6SN9zRb97+dPFnHoJZbW7xyIpzikCa2ASVQ/QOKNPWe/KbFZL+tGkWNIwYndj0fZc4U8iO/qDc OAEfLJVfnkrG/I4fVolKcGr+qmwhhp1cYSyzUjX7VyyC+o8Ln/rrAnVTyRfAvh2RwHqqGjeG8GPjb c5rEYWoGjJy9WYXba6mcPnH9t165qkEIYqc5+KqSdxh66g8qn3ndD3X1J7iJwM/7xXLg4yKjsNvDF hwvHSSWrQwKjhnn6T61Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CKu-000000037ou-10n8; Thu, 09 May 2024 22:34:00 +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 1s5CJa-000000036wv-06l6 for openwrt-devel@bombadil.infradead.org; Thu, 09 May 2024 22:32:38 +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=axSAZHgAHpBIwpmETIw5If+E1m7OWMtFCBLKF0tg/Pw=; b=WC/rMRuJ/8k4xhrQ9wxFkFct8T 3QM9p+xF6gp7B58Wb9Fadxtj4/Kalo3GJGQ6OhW152Fo80AzPn40nL+V2ThR4rLcJc1qdptw7gSdv 4Hpk+YlsFAzaX73B31X/WMj4eBYkxx7M/5U+xz6OiYjFksWWNjW+K7z1i2VvS40wwOWMG5J/pXOFm foZkbWs4oFTeyrmZ3/HWJsCP1oX7rJspzcgq33jspnv7LFimvaIeacNii4+PYABUlxXiE9MaJ9uMC UOXEI99tdBbD7ZRZul4kKQ4z71nFBb9OCVYxSQxBgb/kTqR0Ca1G9ebi5isgtXkrj0jLdNwT9qSpy wn4oL9Ag==; Received: from mail-lj1-x22a.google.com ([2a00:1450:4864:20::22a]) by casper.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CJR-00000001aJf-0IUu for openwrt-devel@lists.openwrt.org; Thu, 09 May 2024 22:32:36 +0000 Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2e09138a2b1so15195261fa.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=1715293937; x=1715898737; 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=axSAZHgAHpBIwpmETIw5If+E1m7OWMtFCBLKF0tg/Pw=; b=ka8MrV4RLG6uNSuyETEsQS//POt4fxYW5jbTPDZb2gxIoaj59wCqPRz6+VW8zHZVB0 9Mj1tPfX8UIvzTeCyULfasBp9dkhS0Uqd/sVmUkE3jp9HHMwE31jby/ctBm/L0PsWnl6 mHKEVJmetbF4CFp40cwn8dTazre4JRYjm3hRgpAxAiMb2wzmo63IHaEPoRriq9/qFNXg dA5VNB0VEctOlCtLg4ZTb7kKYJyxGPt7MtkCyR5LtVK17j8psqZubTXp10y5EqaE8/15 /AQb56PS/Oqg2V4REA81Z76SDNxA6YcfLV1YsFOylfHlKN5CJSOevcW9MJ3lI9zSItJU bKOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715293937; x=1715898737; 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=axSAZHgAHpBIwpmETIw5If+E1m7OWMtFCBLKF0tg/Pw=; b=hbUklacVYGTmRXRgA9+J4nXe0/hmo8kqEg2BrFDpdIUWu1LxmMXkoALGHMmpv3Pba2 W9YTtdLw7+fClzFW5iY8pbSsL2APXGiO+wAfh07BxikS5Nk6VclMgiFLCsIBNtLL4KMX jE60Jc81DJM6ydG0c+E0yclTfpLbqJWb4z/gI+wdsmc2K+APTWG9PSK1wqTbjFUSpav7 Wx12mQ6eUn3ZUgmeEwl02EXYFPJNd+oTWixGljX4wWBzRc/aJrC3LOh/CFXfItu3xbp7 /sKGVaJYkmUqqd2RcvttfeH8KOeD1HFv5HwAVw+w5iTUacgdbNCq1qZ0CGId8w5zAeO5 s1ew== X-Gm-Message-State: AOJu0YwIjzAusasNhJ1KuyYKLXbigORvay4UN0srirvD9EnQ++h5v4B8 +w2mhiW7yOXmGsWu1IU8UUxFphOaX3Xotkzr32oJvIellnTecAUhcZ6Pvw== X-Google-Smtp-Source: AGHT+IHRMgFceSOZvmVHNn/frPDZ+ioqsYSnl7a2x1pBA9T0s47tqNIbzaVpWrBevreEbLE+qBfA0Q== X-Received: by 2002:a2e:8255:0:b0:2df:8ce6:96ae with SMTP id 38308e7fff4ca-2e51fe52568mr3872221fa.7.1715293937126; 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.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 15:32:16 -0700 (PDT) From: Paul Donald To: OpenWrt Development List Subject: [RFC PATCH 04/14] router: refactor calc_ra_lifetime, and define ra_lifetime as uint32_t Date: Fri, 10 May 2024 00:30:36 +0200 Message-ID: <20240509223213.97389-5-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_286487_45A1C1DA X-CRM114-Status: GOOD ( 12.68 ) 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:22a listed in] [list.dnswl.org] 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] 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 ra_lifetime no longer holds negative values, because we no longer do 'init' when we do calc_ra_lifetime. Signed-off-by: Paul Donald --- src/odhcpd.h | 2 +- src/router.c | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/odhcpd.h b/src/odhcpd.h index 7a82e98..09cd4f1 100644 --- a/src/odhcpd.h +++ b/src/odhcpd.h @@ -314,7 +314,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 96237d6..b859c46 100644 --- a/src/router.c +++ b/src/router.c @@ -366,17 +366,14 @@ static int calc_adv_interval(struct interface *iface, uint32_t lowest_found_life static uint32_t calc_ra_lifetime(struct interface *iface, uint32_t maxival) { - uint32_t lifetime = 3*maxival; - - if (iface->ra_lifetime >= 0) { - lifetime = iface->ra_lifetime; - if (lifetime > 0 && lifetime < maxival) - lifetime = maxival; - /* // RouterLifetime is a 16 bit packet field: skip this check - else if (lifetime > RouterLifetime_MAX) - lifetime = RouterLifetime_MAX; - */ - } + uint32_t lifetime = iface->ra_lifetime; + + if (lifetime > 0 && lifetime < maxival) + lifetime = maxival; + /* // RouterLifetime is a 16 bit packet field: skip this check + else if (lifetime > RouterLifetime_MAX) + lifetime = RouterLifetime_MAX; + */ return lifetime; } 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; From patchwork Thu May 9 22:30:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Donald X-Patchwork-Id: 1933678 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=rIHNSX0w; 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=XqOo5aVD; 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=XT0n9CDM; 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 4Vb6Kh63sQz20fh for ; Fri, 10 May 2024 08:35:36 +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=19MPPDfd/2MjQRMkU7oTKw06GRlCjMzkoqK6Ut0x14M=; b=rIHNSX0w1uo4PM o2EJa/PCOluAxbdbren+9/GV2Kbva5EHW6E8O/EeYwXhHtzugjPDA52ZqMxRJnUMtqZKBheAJ3r+C zPaUR4upqP4klpY/H0FIOHpLbZ8P+q+oPhB8qhWVNKQyBs9bcRuLZvkD2dEJuc3KwE9yKyPyEa11N JRXeNWAxtptIP8jo/kW8ObnrAy/FlZw05xdzIM509TygFyN7pPTO3L9s+Lf2eaU3KdcMEn3gPvBUF wEi1Dq3c7o/lC24/92Q+zdNeJ8FgoA9Gg7qkq3j8opev1c1VqLPahZoeUVDjkWFBxY/hfFLyZQ/E6 1Qk5Vxi5iXvclzLr70Eg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CKa-000000037a0-2nEK; Thu, 09 May 2024 22:33:40 +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 1s5CJY-000000036vn-3ROv for openwrt-devel@bombadil.infradead.org; Thu, 09 May 2024 22:32:37 +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=Czg5q6Uxi8LowDW616RLS/5yCHTaygMry1DedfJP59Q=; b=XqOo5aVDfJLc1DwcCIKTVm221D g0o0Bp/xZlsf4mixp/dEqjghVdNKUqtt7GrSIjC5Xj/RKOwF+w0y2Rx1SByD+kVeJwmI8pmFHUGLn fPexlFUAjTvm6bzt03dN5WYxO5zahTzbQQnCtpLcXeKhtQXilTlLuCHYo0Z7Z9Fi6aOB726IvQYD4 2BpXXIDGLeG+zgoxrFk/UwDUW80iI4fNjwPbDLiEVqByPV2bZeVC2Zr4/kyBUxwwQKjVVgJHl4xv5 cugaj6AqqQ1QhxJzjg7BvdcGksSfuZH7/SGQ1lgoBc6YD3PP9tFvRBA/uEFJtUuZpXkmDAI+4qR8B OZ0x66yQ==; Received: from mail-lj1-x22f.google.com ([2a00:1450:4864:20::22f]) by casper.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CJR-00000001aJi-0LGL for openwrt-devel@lists.openwrt.org; Thu, 09 May 2024 22:32:35 +0000 Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2e2b468ea12so12302941fa.1 for ; Thu, 09 May 2024 15:32:20 -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=Czg5q6Uxi8LowDW616RLS/5yCHTaygMry1DedfJP59Q=; b=XT0n9CDMr5tZunlly2OkqyjivOKEHN9LSiwK11hwUOxgHwrPIu97Wrj3jv+Onkz17y Nnqe5HFxIdT65tU48brCJ8/B4hOM2Bm68KzH+MN+qTxMHkIhEQAovrobWyePyN/3Ioo4 1ZFoQFw3uPzHqJYzdz/476QM6qe45v9XnTawq8y3d+Or9XoltmLpMHwzv/eOA/Tu9ueB AStlcJv/YO2MkqAXZQ0vnvNVmBvjrYPRHbTuf1BY9q1vwQ+x9Dg+Pbr56Ci2/6N+Ys4Q spmbHA/06Hh20ky+OQogO0fI13XpHMOJbSMsxPVhdAujl/sOdZW8n50iqNOStDpwyrN0 NjMg== 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=Czg5q6Uxi8LowDW616RLS/5yCHTaygMry1DedfJP59Q=; b=kOVRXqeJlu+Rrg0RVO9GMATt1nDkCSTXLn+ZYREyAhWwJcJXobx5yPDcmmNqmeBYxh TGLvCweMMNyuuCxD30E+Wq04L7md7O3XG8FvEDMnnK3RaRLdL46VGcd3vgxnPDHW2IGY cY3/nMHlcz6Ad+crgGY9IVvY5DJPD9JR1Nmp8uvCuCJARstAVVjvdcuNEQmFK6DhRF/g eMv3ywf9dfhhKRSu0AjBMYPE8HI1qsTZCTo+Wpp0fr1xT2ciZSfVDpcVY30vuPWPckqS x7bOVaBhrI57UJtIVCu7Y+/QUodMVRTU1YVRrW1N2wfv0hIWilQp3DdCFs4HL+IDYJix f9IQ== X-Gm-Message-State: AOJu0YxTY4NI4pqv2WPWosZi0GPdia4ylCzv1p2qYLj1pjYlE3akYukq eTgLLAhPNntXAYtFAY4ZJ4geO3ED6tY4w2dfBLmTj1DnCdCBBqkZPQgo1w== X-Google-Smtp-Source: AGHT+IGjXBsLuaHfQqC82fyF2iHoicZy8sTU7841rSyAorhK+33/yQyNmeC7YDsQNWSbGfjbhAzZtg== X-Received: by 2002:a2e:8608:0:b0:2e2:a99a:559 with SMTP id 38308e7fff4ca-2e51b4784d9mr2559691fa.25.1715293938051; Thu, 09 May 2024 15:32:18 -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 06/14] config: implement RFC4861 AdvValidLifetime (make configurable) Date: Fri, 10 May 2024 00:30:38 +0200 Message-ID: <20240509223213.97389-7-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_271157_9FDACFEF X-CRM114-Status: GOOD ( 14.65 ) 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:22f listed in] [list.dnswl.org] -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] 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 In accordance with RFC4861. Enables control of ULA. The new config variable is valid_lifetime. e.g.: config dhcp 'lan' ... option valid_lifetime '6h' Signed-off-by: Paul Donald --- README | 2 ++ src/config.c | 14 ++++++++++++++ src/odhcpd.h | 1 + 3 files changed, 17 insertions(+) diff --git a/README b/README index c8f2eb4..4d1956c 100644 --- a/README +++ b/README @@ -155,6 +155,8 @@ prefix_filter string ::/0 Only advertise on-link prefixes within filtered out. ntp list NTP servers to announce accepts IPv4 and IPv6 +valid_lifetime string 30d Value for the valid lifetime + for a prefix Sections of type host (static leases) diff --git a/src/config.c b/src/config.c index a3bf1ba..285e3a1 100644 --- a/src/config.c +++ b/src/config.c @@ -93,6 +93,7 @@ enum { IFACE_ATTR_NDPROXY_SLAVE, IFACE_ATTR_PREFIX_FILTER, IFACE_ATTR_PREFERRED_LIFETIME, + IFACE_ATTR_VALID_LIFETIME, IFACE_ATTR_NTP, IFACE_ATTR_MAX }; @@ -146,6 +147,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = { [IFACE_ATTR_NDPROXY_SLAVE] = { .name = "ndproxy_slave", .type = BLOBMSG_TYPE_BOOL }, [IFACE_ATTR_PREFIX_FILTER] = { .name = "prefix_filter", .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_PREFERRED_LIFETIME] = { .name = "preferred_lifetime", .type = BLOBMSG_TYPE_STRING }, + [IFACE_ATTR_VALID_LIFETIME] = { .name = "valid_lifetime", .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_NTP] = { .name = "ntp", .type = BLOBMSG_TYPE_ARRAY }, }; @@ -217,6 +219,7 @@ static void set_interface_defaults(struct interface *iface) iface->learn_routes = 1; iface->dhcp_leasetime = 43200; iface->preferred_lifetime = 604800; /* rfc4861#section-6.2.1: AdvPreferredLifetime 7 days */ + iface->valid_lifetime = 2592000; /* rfc4861#section-6.2.1: AdvValidLifetime 30 days */ iface->dhcpv4_start.s_addr = htonl(START_DEFAULT); iface->dhcpv4_end.s_addr = htonl(START_DEFAULT + LIMIT_DEFAULT - 1); iface->dhcpv6_assignall = true; @@ -659,6 +662,17 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr } + if ((c = tb[IFACE_ATTR_VALID_LIFETIME])) { + uint32_t time = (uint32_t)parse_leasetime(c); + + if (time >= 0) + iface->valid_lifetime = time; + else + syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", + iface_attrs[IFACE_ATTR_VALID_LIFETIME].name, iface->name); + + } + if ((c = tb[IFACE_ATTR_START])) { iface->dhcpv4_start.s_addr = htonl(blobmsg_get_u32(c)); iface->dhcpv4_end.s_addr = htonl(ntohl(iface->dhcpv4_start.s_addr) + diff --git a/src/odhcpd.h b/src/odhcpd.h index fecd77e..ddbc6b3 100644 --- a/src/odhcpd.h +++ b/src/odhcpd.h @@ -320,6 +320,7 @@ struct interface { uint32_t ra_hoplimit; int ra_mtu; uint32_t preferred_lifetime; + uint32_t valid_lifetime; // DHCP uint32_t dhcp_leasetime; From patchwork Thu May 9 22:30:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Donald X-Patchwork-Id: 1933670 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=upIbM8z9; 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=sq3gosWR; 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=F0NrcZoq; 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 4Vb6Jm5bzLz20fc for ; Fri, 10 May 2024 08:34:46 +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=HnlfTXB9Ad7ZDc45XEj0t5s/4tEw+9Wp4eXv4ROE7og=; b=upIbM8z9mOjZGI QbScbBeLg5jL82gXCou3ak5io+AjxnVyAN5vL2SDKSxgBlkBuqe2Q0jGSBtaYlorqyuPRzTsnk4Dg z3G/xbc0+DyFC1v4o9ykA0zLIHk3Yfcad8f8rDGTCXK0a8IJDE9GGSmFy7I4F8HgRAtAUtBTYHUGe GiFouuNkjkwNe3fhyPiCxsgVJr5daPbjATIERIFpPsoLcur3OPgdm5coUcRXkPjbDlxfgkP5PmmmS z/9RD/8Eko2Y09djb4dUXMxbuniul5JETxcVUOvTu1qVBfyOJTFhMqY2vT7CqkTWXzobA8/dQzwAt 7tHS37OXnxHYUebz38+A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CJy-0000000378t-05bT; Thu, 09 May 2024 22:33:02 +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 1s5CJW-000000036u1-3o70 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=GIEtKM49ldiEdo/+ymIUBm8FpXIyEWstxeZ/kFlw3KM=; b=sq3gosWRBVEZt6MLfqWOsYQ5qd OuGRWnMs0hLZcmGiWmqI3VqfHjkn/I/yiosfAfk1Rn1nJWWJH/6tWNmC5p/qqy+9RZzvZrLUulek+ KkhmJKrxuwnoGg3AOVDWIP1USoPc99BoP7k30qO+bVbcuBz5eZ1Y8LTyAOdEgnzfXNhVUTo9MHil3 3TX81MxMjBxsRTprmDRHWHI5ueORJKXjGObz56SS/WGvw7micXF6ngiVqNOnxbnsPM1lsxDtOa+Kg fr/idYIok/UJs3HUJQYbzF0Re4SaIyr0f6Ip5Bj7N1ybc6TM3QDWVt5gWtfEew45aHs+GJ0bM23z7 P7W/Xaqw==; Received: from mail-lj1-x236.google.com ([2a00:1450:4864:20::236]) by casper.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CJR-00000001aJj-0IHM for openwrt-devel@lists.openwrt.org; Thu, 09 May 2024 22:32:33 +0000 Received: by mail-lj1-x236.google.com with SMTP id 38308e7fff4ca-2e1fa1f1d9bso25169261fa.0 for ; Thu, 09 May 2024 15:32:21 -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=GIEtKM49ldiEdo/+ymIUBm8FpXIyEWstxeZ/kFlw3KM=; b=F0NrcZoqWUuLwCUK7/VNn8B4qdnpTah9twXyg1eptkwg466f7kVDg3VFAvuv47IObj xe3oHcorZikxOl1OWFHikO7WytdT4AqCwi/ZLa3Arl8h/GAuMoBMNwiNTzDOEOQBeAzn VLel430PPkBhgFXrsU7FMbkhCUCmbkfaIwFM7T/OohNkb7d/0qpqXuMFrmknKngN3wDi D8LsqSXox4Q197hkvb0m5j+6QEo5A5vh/9Tyu1re0giUkKkamBIHWXID/sXBh2Ets2nD 8XbAA+FsVmqT6t7cPFJrtkMiaYKp3LQofw1flawPteMdM1VqRaQz+6X7NudjnHbr4CIf ZjYA== 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=GIEtKM49ldiEdo/+ymIUBm8FpXIyEWstxeZ/kFlw3KM=; b=IJaZHgWOuwkfKbuVEpUtrLB+21j7zmIADqU1EkCeAF9G9cRoBxMkyAlmv/20VX8HKT bq2GYiOGifw0UEOdwdmeG10BBy3PuAKT0jwdbjScuPuAAbTJULwNYS2Q+wSbwM9jDySg hJvMQOlN7BCSRdlR+K33UKe6Z8liaFOabF042AxjmTOYEWXmyYn1DPsIgbRP7lIUQ8bg z1XPj1WiOLUaTH5o+IWHvBeqq+/5hM4dcztiqDqGcEdehBHj13uiEXFW2wfOLoYFNuyU ohmBdFRmS/Wy+yDtR/dVPwld5wiRWDKGbBY6e1MqKBQDvWxu3j8xVe/1Hj8E+QS8K17n aEIA== X-Gm-Message-State: AOJu0Yw9ohKDpTab3GQkbzpVaUNSLynbQS7PNZp/XIyMBVgF3ut1Pku3 b+Rm3lH3h81tA/ARX8W8cZUpuhRg73yl55YCt+UeNH1lYO3DMqb77Bg/8g== X-Google-Smtp-Source: AGHT+IEaQQwgrvRN5zeo4L4+JrGTQk4Yz/+Dch9i8I8sO8kGf+/gmhqfJ42aLdIExPuj+66g3DEYJA== X-Received: by 2002:a2e:3c0c:0:b0:2dc:14d5:4621 with SMTP id 38308e7fff4ca-2e52028a8femr5938401fa.34.1715293938446; Thu, 09 May 2024 15:32:18 -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.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 15:32:18 -0700 (PDT) From: Paul Donald To: OpenWrt Development List Subject: [RFC PATCH 07/14] config: lease times are all UINT32_MAX; drop double size handling Date: Fri, 10 May 2024 00:30:39 +0200 Message-ID: <20240509223213.97389-8-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_181388_1978DE7D X-CRM114-Status: GOOD ( 12.00 ) 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:236 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 This now prevents implicit 64 bit->32 bit truncation which may flag compiler errors later on down the road. All of the variables receiving from parse_leasetime() are uint32_t anyway, so max 136 years of valid lease time will have to suffice :) Signed-off-by: Paul Donald --- src/config.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/config.c b/src/config.c index 285e3a1..6b3cb01 100644 --- a/src/config.c +++ b/src/config.c @@ -359,9 +359,9 @@ static void set_config(struct uci_section *s) } } -static double parse_leasetime(struct blob_attr *c) { +static uint32_t parse_leasetime(struct blob_attr *c) { char *val = blobmsg_get_string(c), *endptr = NULL; - double time = strcmp(val, "infinite") ? strtod(val, &endptr) : UINT32_MAX; + uint32_t time = strcmp(val, "infinite") ? (uint32_t)strtod(val, &endptr) : UINT32_MAX; if (time && endptr && endptr[0]) { switch(endptr[0]) { @@ -380,7 +380,7 @@ static double parse_leasetime(struct blob_attr *c) { return time; err: - return -1; + return 0; } static void free_lease(struct lease *l) @@ -443,8 +443,8 @@ int set_lease_from_blobmsg(struct blob_attr *ba) } if ((c = tb[LEASE_ATTR_LEASETIME])) { - double time = parse_leasetime(c); - if (time < 0) + uint32_t time = parse_leasetime(c); + if (time == 0) goto err; l->leasetime = time; @@ -641,9 +641,9 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr iface->no_dynamic_dhcp = !blobmsg_get_bool(c); if ((c = tb[IFACE_ATTR_LEASETIME])) { - double time = parse_leasetime(c); + uint32_t time = parse_leasetime(c); - if (time >= 0) + if (time > 0) iface->dhcp_leasetime = time; else syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", @@ -652,9 +652,9 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr } if ((c = tb[IFACE_ATTR_PREFERRED_LIFETIME])) { - double time = parse_leasetime(c); + uint32_t time = parse_leasetime(c); - if (time >= 0) + if (time > 0) iface->preferred_lifetime = time; else syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", @@ -663,9 +663,9 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr } if ((c = tb[IFACE_ATTR_VALID_LIFETIME])) { - uint32_t time = (uint32_t)parse_leasetime(c); + uint32_t time = parse_leasetime(c); - if (time >= 0) + if (time > 0) iface->valid_lifetime = time; else syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", From patchwork Thu May 9 22:30:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Donald X-Patchwork-Id: 1933668 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=JHK8+Nv0; 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=gXVVb89A; 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=Qr8PAPF5; 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 4Vb6Jm5r51z214f 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=i3p1Pasr0GORexrOGcvPNxqu1z9lle7P6uCc3EHQbL0=; b=JHK8+Nv0m49ydy pvyFCJVcSpVa5OD87ATs1+RlbgTK5/Xg7tyYG0/z+KNepQSCfYcr1vLoUAJPuSxK3boN0ltP/byp9 FFfU4FhX8hykEjhyLq940wC2/yZ0lj7UoJe9l854McWxj2+R/1fHhIN7ArR3+h3uPSijhEuncxK9M mBK0U4xYgL8kGkQEN0gnovLk89WqjLL5VjX5EoncNMN4WSL3xRU/Q65bmwSrcZ+P1/trLojQU9oKo IXJyPml+pUohTGrmfyOt0Hh2xOlBoT0FUjPaG0zlv/L0fZyyfC8xOoEKnfv0R4xKqjeHA83aROmAM kf+Ii7/IF+5DaH9m2CWw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CKK-000000037PI-3s1q; Thu, 09 May 2024 22:33:24 +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 1s5CJY-000000036vh-32Jl for openwrt-devel@bombadil.infradead.org; Thu, 09 May 2024 22:32:36 +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=5zUWPezWduhtOWPJwO5ZFNp9TGPKZEPOZ6fcFT9Pgko=; b=gXVVb89AaQGmIKvmL9Uh1ZiC/U NKY7Vk4NK9cj0AeAbgoHbxMCHnueuOC4DLitDBO+U4pi6CsCD1aLMXf2KDzfgb9e6v7Hw2pRKhJA1 yWY0gKxtE8Zf4+fFFkMvsS9Wn3mIki5vub9tSMcy9aRygpKIL4F2CSJqDI8AO+zdhJSB+91Mt5hD3 h85ck9TFAXdxreJCZl2Wz4H4z1NK+g7HIJb2F23ItLUTIoY2A+AOE39UqNxybuneK6i6e/nKDQnWe vukKdvm03tkJ4J4wdoHtXd81yj+by9qPyTp0CB2DZKFXrX6rkNd1UCnV5vEt3fY+st7a5KiVwLMLY cMMJ5hUQ==; Received: from mail-lj1-x233.google.com ([2a00:1450:4864:20::233]) by casper.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CJR-00000001aJk-0Ila for openwrt-devel@lists.openwrt.org; Thu, 09 May 2024 22:32:35 +0000 Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2dfb4ea2bbfso14982621fa.2 for ; Thu, 09 May 2024 15:32:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715293939; x=1715898739; 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=5zUWPezWduhtOWPJwO5ZFNp9TGPKZEPOZ6fcFT9Pgko=; b=Qr8PAPF5zlvlYPkSIHrty9Ju3jRH/I2MaN+I+Dx6h29LgtwEQMkTEW+BGrFAHlz1OT VFwURdqivz8ovvy6VRW8DZoWB0urBMWnZXqKH8nKLkpKpSc/wQLO/qkvxiqz/3INBfeu DBFJk4xeTLBPZ1LNzk5vI+ykuCl+N1YFvKk3rU79FfZeqOM3BZELmrZoh93ve2JvTqL4 D/olldbs15tooLWMj1SLpoToP1Fm53Jb0fLHxAaShnjGrZoAQDHrgePjARAvfCGZ9Gjt 8rY9kIyD81JFE9h1kuqj+0Nz7LWoa5sen/L7T9HtvPUtM0DQmEARPUhwosfbY13H22In rzIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715293939; x=1715898739; 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=5zUWPezWduhtOWPJwO5ZFNp9TGPKZEPOZ6fcFT9Pgko=; b=ueEo0PkpXHCuXlZBG/0Ckv99QUvcYhglAq5N5TNjbDWZyxi18XUfncSCyEc7WWUMeQ jcA/zsPfEUOqhWy+r+ZG9vURutXHH69CeF1Sg+1Z1ZuRGvoWvjEeEnZfmc1Esdv7F3Y2 8JC0w9qntY8zwTxjyqaHFhQEdiW/lfpPGED6BSIlrGAt0ORmW6IsHjHltA6XBFq4zQcu E9vDzAzn/pypa7hw4qgwK4GD1zd8Gv+W8fM/PsVRT7rSj10XfewRBkUD2AFwmPUXDKlW G9Bhai5BvnyaRixuAFMMMeLEvV+vIGEBL5l0R3Yf25NMjcSSVRs5D1wqOX0eN3fe71sk jFPA== X-Gm-Message-State: AOJu0YwJB/8tv/XDLdfE4aOJtmaf6O3cGVDrvUgRPbBO1GpuoU7xK2bB fvh5ThPwNOKt1Z0M9zmMxxFyqau4mizJ7/QfuCVjAxUCyyaJKFCIBpZ+vQ== X-Google-Smtp-Source: AGHT+IEemiW33Dfsd9/RbkhAg/JVxIZGSGGPzV1puuj2yMSNUS2mgMCh9m4ZBzKXKTUUDS+nn/wJ0Q== X-Received: by 2002:a2e:bc0c:0:b0:2dc:d7a6:1e53 with SMTP id 38308e7fff4ca-2e51ff5d20bmr4479171fa.18.1715293938856; Thu, 09 May 2024 15:32:18 -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.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 15:32:18 -0700 (PDT) From: Paul Donald To: OpenWrt Development List Subject: [RFC PATCH 08/14] router: clamp prefix valid_lt to interface valid_lifetime Date: Fri, 10 May 2024 00:30:40 +0200 Message-ID: <20240509223213.97389-9-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_256036_D02BF973 X-CRM114-Status: GOOD ( 11.51 ) 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:233 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 Before: == ICMPv6 Option (Prefix information : fd26:3c30:a222::/64) Type: Prefix information (3) Length: 4 (32 bytes) Prefix Length: 64 Flag: 0xc0, On-link flag(L), Autonomous address-configuration flag(A) Valid Lifetime: Infinity (4294967295) Preferred Lifetime: Infinity (4294967295) Reserved Prefix: fd26:3c30:a222:: ==After (valid_lifetime set to 6 hours):== ICMPv6 Option (Prefix information : fd26:3c30:a222::/64) Type: Prefix information (3) Length: 4 (32 bytes) Prefix Length: 64 Flag: 0xc0, On-link flag(L), Autonomous address-configuration flag(A) Valid Lifetime: 21600 (6 hours) Preferred Lifetime: 21600 (6 hours) Reserved Prefix: fd26:3c30:a222:: == Signed-off-by: Paul Donald --- src/router.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/router.c b/src/router.c index b859c46..00752af 100644 --- a/src/router.c +++ b/src/router.c @@ -600,6 +600,13 @@ static int send_router_advert(struct interface *iface, const struct in6_addr *fr if (iface->ra_useleasetime && valid_lt > iface->dhcp_leasetime) valid_lt = iface->dhcp_leasetime; + + /* currently the only way to control ULA valid_lifetime */ + if (valid_lt > iface->valid_lifetime) { + // set to possibly user mandated valid_lifetime + valid_lt = iface->valid_lifetime; + } + } if (preferred_lt > valid_lt) { From patchwork Thu May 9 22:30:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Donald X-Patchwork-Id: 1933671 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=V5srYkG9; 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=hbyi0o1t; 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=L2DAGGeX; 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 4Vb6Jm5jRnz213s 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=JE0tafP5pHcsZY8HnpphuTLtsrnTZRU4XyPdvIsKZiE=; b=V5srYkG9KNSyEh 16VFjJeM7MmeMrLnItiu4gijNMGVWbk6k7wiXHr0w9sZxEU18UTRql/l57yjw3utw4MFQokENTmry 9d7yb0+V2mx4ShgkzU+8EWn7RihEd4c1aIFGN5/0RHGnSry2TEqLIfCg7o+DOjLke5gOW3r5Vgr29 juuD8qdiLoz83+IEJschdia8c71cEXCfrm3jQ6WiI8+3w/n9oPdnQ0aVO14dfefpzywKv7UuZq4v1 zDYVrLlO1VFCOBoQOJgt/xmkJr82gKiondjDwoJMyYudGvJwgily5ZV8IyRh4dm1Nfr1ZL7MGWTPi 2qM4xqV08Updtuzs5qmA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CK5-000000037DN-3OR3; Thu, 09 May 2024 22:33:10 +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 1s5CJY-000000036vD-1rzp for openwrt-devel@bombadil.infradead.org; Thu, 09 May 2024 22:32:36 +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=AfmGVRe3R/MBdjGXDbL7nIe+1TH016x3tHInG/BWzto=; b=hbyi0o1tQOAri93dc5WyGEFpwb U1k2H6wo/gj4FWK/5GB6usmH19djrYnCt6ubt6iGM5xgOcnpQ9yzZHwWUBMeHi+u4HD15f/hfA934 6yHlWjXQxb+rIjK0e2k+kKr2e5x3UF26mafjsOdOaxbTNCrfvDAnHB5wCc1fmP2tmsudWQhyNIRyK KQCh7BKOmIWUhpztELJqGLMUKPfIExJe96jbMravEFRJVLehqOX81XDJ2AEHzimjmHN9Wfddul6th 16YzNPpG3d9XHGus26bTT4s/+z7G2U4pCz+vEXEpdiOA7f9v9N8ccQKncNNjs+UZOiGFKLWRPwNWj waTcdpng==; Received: from mail-lj1-x22a.google.com ([2a00:1450:4864:20::22a]) by casper.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CJR-00000001aJl-0Iga for openwrt-devel@lists.openwrt.org; Thu, 09 May 2024 22:32:35 +0000 Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2e521817c1fso4925411fa.0 for ; Thu, 09 May 2024 15:32:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715293939; x=1715898739; 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=AfmGVRe3R/MBdjGXDbL7nIe+1TH016x3tHInG/BWzto=; b=L2DAGGeX+egtbfvAn9NYkjNw+d07pBn5czZsuKSXlifFFIl1f04OxyokHha//x3G3C dU6Vcj9p0yDxQamqrH1OGm/dAl65yBYcuhvAKAOOnhKMBmKlTIMv3w+JO4Yoo2kTuMR4 Vqm11dhFDuPx+HBnucmnFCvzYj5RZ9xbSQyu/KrTg5bVFs8utx7s5T8x81uuQckPOITn oq+GU0iRGsM5l0Jy0u/IvwWsEtOQiClaWIv6tiHwPZmsdIBSLTXJ6RQspN7RKp4BTUOR gcoVUSwuFn0xenHixNoXEaE6P7tQ59DKD33xRLxuXd635C4thKOGVPLIrukWrKxDd1Bi kSog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715293939; x=1715898739; 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=AfmGVRe3R/MBdjGXDbL7nIe+1TH016x3tHInG/BWzto=; b=n5bJvi5lG76hRihcfPk7WOwouQ+fqIqnyjEsryWs38cBM3OgrqMxQTOJhPLRMkkj+y C26rElj+Fg6pNuDkktuKimv6AYGLnvsPWJYuCHUSfT2O7GWBKGTUA0nFA7+ihKlQPBVQ 7jCW+EdC7Jkr0iQhv6iE8fJLTbbBGtleL3OCVnY1rB+KsjP20YqZ+gFuE2RcCHLk/Zo6 tPYial6KWmlwpNBnCeleFQN/auf9f2v2DuqzKoaydCAaoqXqgXS2UXPesbevmQfdbKa1 JAcqcSbez78j7QS7nyI0uACThREx3JJN3O+/GcIV2Cc41h1aBPZQc78uITj3b6iIAgdp Pnfg== X-Gm-Message-State: AOJu0Yz2UX2CKzLd2NeofYhKEQIW8GQCXu13NDGgkUgR/KoS9P1z/9C9 n8JCoHa1SlOqmnTVagHmuNdQL3mYAKFis3dxW2WDHxipwp/HE1M3dWADug== X-Google-Smtp-Source: AGHT+IHXPTdEeDFQBijxs43lXwvIC31wKcsLFwpamFNSr+a1sh9ZfCAcp2B5XYYZeyYFqNsTiMFX8w== X-Received: by 2002:a2e:2c13:0:b0:2e1:e8fa:4f56 with SMTP id 38308e7fff4ca-2e52028e665mr4103221fa.42.1715293939322; Thu, 09 May 2024 15:32:19 -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.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 15:32:19 -0700 (PDT) From: Paul Donald To: OpenWrt Development List Subject: [RFC PATCH 09/14] config: clamp ra_reachabletime to RFC maximum (instead of complaining) Date: Fri, 10 May 2024 00:30:41 +0200 Message-ID: <20240509223213.97389-10-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_260260_9D8BFD69 X-CRM114-Status: GOOD ( 11.19 ) 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:22a 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 Attempt to be helpful. Signed-off-by: Paul Donald --- src/config.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/config.c b/src/config.c index 6b3cb01..54fb9b5 100644 --- a/src/config.c +++ b/src/config.c @@ -939,11 +939,13 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if ((c = tb[IFACE_ATTR_RA_REACHABLETIME])) { uint32_t ra_reachabletime = blobmsg_get_u32(c); - if (ra_reachabletime <= 3600000) - iface->ra_reachabletime = ra_reachabletime; - else - syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", - iface_attrs[IFACE_ATTR_RA_REACHABLETIME].name, iface->name); + /* rfc4861#section-6.2.1 : AdvReachableTime : + * MUST be no greater than 3,600,000 msec + */ + iface->ra_reachabletime = (ra_reachabletime <= 3600000)? ra_reachabletime : 3600000; + if(ra_reachabletime > 3600000) + syslog(LOG_INFO, "Clamped invalid %s value configured for interface '%s' to %d", + iface_attrs[IFACE_ATTR_RA_REACHABLETIME].name, iface->name, iface->ra_reachabletime); } if ((c = tb[IFACE_ATTR_RA_RETRANSTIME])) { From patchwork Thu May 9 22:30:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Donald X-Patchwork-Id: 1933672 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=cQeVa4q8; 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=PASNfIyg; 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=Kdim96im; 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 4Vb6Jz0zHLz20fc for ; Fri, 10 May 2024 08:34:59 +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=RgnOHe1eNduM8rXtshFxY3YdSoePNUn78EoaBlDS1ig=; b=cQeVa4q8lAtpSr t7koPverdVlJjO0U/inZt/BnfFl2fGP6/jhRKmV2AGYUeynpNwDSd44z2h2ONS6tONe2PSZM68ot/ CGWYZ0BF5dsv4E3fzdzDJbOW4DJkXqGwF/YyyI8fgTVORrMaUL6TLo1pEY+S90HYONzT/QyHydosx zsc9BQf4YcUijPyLJAdVvNfM0IJsx6zGc8uxCrFBIUfxbMOxVS8hrLwU2pwbHOFBl5OD3NUG4LPH3 kVXbRj3xr7hDCgL1Wd6G64Sm3uTzJWCpP0lRd1e+OBk9e8BprAXxzeAJZ78q9DFcjPfDDJFIHl9oN 2L3GexQuskYfI8acJbhQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CKm-000000037j9-1Bts; Thu, 09 May 2024 22:33:52 +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 1s5CJZ-000000036wS-2o4x for openwrt-devel@bombadil.infradead.org; Thu, 09 May 2024 22:32:37 +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=92ez/3ApKqiMqFdP5TmhIRcqj8LOACO4tRVUcWtio4Q=; b=PASNfIyg+eyBd4r6UVp+Pgod9D 4+70sZs74OnMc89MzNmzaLW+cLzYuDrBOQbyahUPcNIiYARuqQdxUOJCOdxQee7oQ/DE+nOLHnkeL ceTN7Qi/Mp5VGy+Vmg289HDOQATqQ6GvQ2Y/8pUfn286/2Ri8YV+tsmU/1U6LcpU9fP8EKBvpIaQl Y3sy7Q+xMtMu0Z3XhlEblsXkev2YId/NdbNOJdVrOUViT/FG0fMagW9ChERNyHaA3v1m+OWLGIM/6 fVtMIZpREc2w3f/v37Mh+0TyEN0XDUcKOmOtQAf7dNSKVXCsrEd+sZ3Us25Xo3m42UkSaJRgwshs8 r9dzi0EQ==; Received: from mail-lj1-x22a.google.com ([2a00:1450:4864:20::22a]) by casper.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CJR-00000001aJm-0J4v for openwrt-devel@lists.openwrt.org; Thu, 09 May 2024 22:32:36 +0000 Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2e2c70f0c97so17442321fa.0 for ; Thu, 09 May 2024 15:32:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715293940; x=1715898740; 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=92ez/3ApKqiMqFdP5TmhIRcqj8LOACO4tRVUcWtio4Q=; b=Kdim96imcEd6NIFN8huDL6y3MIJ30x7+8WEqTrAdd/83tNAdeAR0sLSTG8+X6NNAtr 7HEcRWGvIEozDKD52PhvrJ4woqsL/aK3ulIzZmuwt6phW6p54dIzj7xS98HmxYjhf2IE 33dErTHegLMY/zN5ibWTJIs4xYlip7iDFDSYCL6N93l7lv8utxTaHnNdEFjEPf3hTcZR 76ym1OyTKMP8U9oUE4bogYguS8CoqXmkOmvnIhXK4OM9XKiPGLFN5GpeRq3ln8zAgVnw jsToM/nzevJLXELGVh8yrLRGS4VJHOymCUJG1UlyYvIgJsa85Pak69dENyKOY5QWKLq9 ZbhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715293940; x=1715898740; 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=92ez/3ApKqiMqFdP5TmhIRcqj8LOACO4tRVUcWtio4Q=; b=lhWB79PvJ84PWb54tySj9dfJzcIIaIWBlKW/I85GbTv6WM0aSDE96zE5NuWpGXNotn qULV1D9R3Rq/as5M1iwddPDgaWmcPDp7piTrJFH94ZX+UsirwY03UEmCXjhyhoXR6TQ6 3H4Oq6SZO9u/1csHMunt3PKve5iV7BD/Mjkrl7Nigg3nIOdGCk5AIYz+Zfl47RUI+7Eu awt2+hBvHNQ4HEVqdvD3x/bZZkeg+1ERgcZmXT5Up+aR6aXj1SxYMjieMU/TGM1jvDTz lYxRXnWbAnMFwlYyOg+fdWlVjJPJ8Lkf9aXPZLC4UoTplIfmLuBB2ad8wEN/OQbz+R3x hDJA== X-Gm-Message-State: AOJu0YwbQu0VkEzFEIcCvbSb2pGnM3ply9NLssnRlFaT4/wH5CEIrCI6 mIe9Z+ybx8LRhb6Bp/Z5AerLk4Ouku6PCJwQnLZn4SlCJVDJ04Cs4hY5FQ== X-Google-Smtp-Source: AGHT+IEeC1hZqGkIgRUgFoVA/pJlqEp3P1gZYfgcoKB+sdWnbwXM1kSQZfQ6qLXyt2aZMuLuAsbtEA== X-Received: by 2002:a2e:a683:0:b0:2e2:7e28:602e with SMTP id 38308e7fff4ca-2e51fe5257fmr3641011fa.9.1715293939724; Thu, 09 May 2024 15:32:19 -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.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 15:32:19 -0700 (PDT) From: Paul Donald To: OpenWrt Development List Subject: [RFC PATCH 10/14] config: clamp ra_hoplimit to maximum (instead of complaining) Date: Fri, 10 May 2024 00:30:42 +0200 Message-ID: <20240509223213.97389-11-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_284388_1469931B X-CRM114-Status: GOOD ( 12.24 ) 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:22a listed in] [list.dnswl.org] 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] 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 Attempt to be helpful. Signed-off-by: Paul Donald --- src/config.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/config.c b/src/config.c index 54fb9b5..e0f2d80 100644 --- a/src/config.c +++ b/src/config.c @@ -961,11 +961,12 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if ((c = tb[IFACE_ATTR_RA_HOPLIMIT])) { uint32_t ra_hoplimit = blobmsg_get_u32(c); - if (ra_hoplimit <= 255) - iface->ra_hoplimit = ra_hoplimit; - else - syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", - iface_attrs[IFACE_ATTR_RA_HOPLIMIT].name, iface->name); + /* rfc4861#section-6.2.1 : AdvCurHopLimit */ + iface->ra_hoplimit = (ra_hoplimit <= 255)? ra_hoplimit : 255; + if(ra_hoplimit > 255) + syslog(LOG_INFO, "Clamped invalid %s value configured for interface '%s' to %d", + iface_attrs[IFACE_ATTR_RA_HOPLIMIT].name, iface->name, iface->ra_hoplimit); + } if ((c = tb[IFACE_ATTR_RA_MTU])) { From patchwork Thu May 9 22:30:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Donald X-Patchwork-Id: 1933688 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=E4eckwOh; 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=tYrWGKRO; 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=djtIfvW4; 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 4Vb7xS4KPDz214W for ; Fri, 10 May 2024 09:48:11 +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=/t4Nk+FrXpGy34T5bw1a1ZzztK8yREkAqrm/TOWcquA=; b=E4eckwOhjXy8am nG+u1Tk9NrS78xt+B49WVJIJgWE+OPOOvXTKYpqExp+UyRd5lcL2845GMj9Dc/sOHbjHVCMbBn/r+ L8DczOBzV7KxFhAjIu0vnukIvipgwsMFn7jTQUYUx6em2eESy/R6zgHE8SK9dj7lmlBKG57MOQsl3 2QjY1ZbFI07loOms8mHzkPYDNXMHxiN3TaVWxMxMzF5Hl4uYkK0tYTgmFzi+TQjINDtBeLOeT3oE8 LEHwh2TGF7b4ddlK02IC5TMlKXjWDkt50j1JIkR1QP+gVvvh0aqSs1ZUUGSKKq6uCBhuFFItD6i8d zupG4HZ7O6OA/53hUd5Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5DTJ-00000003IxS-24P5; Thu, 09 May 2024 23:46:45 +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 1s5CJV-000000036sv-1bsq for openwrt-devel@bombadil.infradead.org; Thu, 09 May 2024 22:32:33 +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=r4I70f19pEFwfLuU2D8UkoITvnSH0lNvdY+CZDKQP68=; b=tYrWGKROLizQyat5JuUlJpSzSV Fece6eXdbu6ElitU5hAch7QjSIZCVg8mkl5Hzt5ERTLzfz/4hH93evgv64xdZtJco6roX9+lPT823 s6M2EDvAR6sb6SW9k4yqxYMFw+0elrfXZx6FQZAr5j5Mga2ZlG9zCHeYKgPOiZj8NCbMq65UcFnTT 3H2h62JATFry7HRR1KrDjS7EiBevLOBKRT4WvzIQwGtYu7lKBC/IuA4/aAO/4DTNe0f3Vg6AfKgDV zWY0li82407fiFhH8M0AHlH6d/L6R2TvKpBY7u9jI3EhH3VsUln3hiqAj9iHFr+4xPwu8Jw6gvP4n Gqx8gK4g==; Received: from mail-lj1-x231.google.com ([2a00:1450:4864:20::231]) by casper.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CJQ-00000001aJo-20sk for openwrt-devel@lists.openwrt.org; Thu, 09 May 2024 22:32:31 +0000 Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-2e428242a38so20115431fa.2 for ; Thu, 09 May 2024 15:32:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715293940; x=1715898740; 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=r4I70f19pEFwfLuU2D8UkoITvnSH0lNvdY+CZDKQP68=; b=djtIfvW4NE8la3kuxv8kqPg+JdehVvwQXjvqBydV/n95ikTW1KRpYthZ1OgxlRNmfe CP1W7NqdBeNm4N8Er702foKRRzSb3ApVnrgSLM7IB6hajMuOvupGSINbWvy7FQykXyfp 05DASJkINNH8UzVAcyRLbLa9T/BjVLqfSoRZvdEHYWdGY1puDRCRZSkqOURpVU51WsIi KGOcDeaAS4NR7ckNA4Pqa7W/umzgVLY9buprQBiu+EByJX/qe0teka7r0JnvnJvXOjnU phqOV6wgZIFZRfqAlwfSkjTSF4gC6HbcOH02MyIIVd0GlRk34gFdP950KW3Ddbr1NAf4 DUmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715293940; x=1715898740; 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=r4I70f19pEFwfLuU2D8UkoITvnSH0lNvdY+CZDKQP68=; b=jWyzc5u5YhHNsbC9GlnsNSO9GXnUekvNGU3jQQBrddQNmzLIFhscT62Q/PjfhG1GMT ChNVTizL3BjmVp+m2Le+r4B38LKw9HEIlezgZtUcXnQSheyp0Le3fNkfUC0DeanjsoT0 +YUatoUq5Do6K6RuuZF3kLVic9U9VPmETY4SIce80y9gfd+tcqjRyvyC6aA0sp+fbntC Da1klQXsARgXa+QS0TsKJi7oruy/C0lOFFvB34U/zvSrYc0Ff3AtfhvAU7MBJNDkWSNl eSx4kq4tBWJVhzcwEW4xle9d82ogXFhpHpTEO8EomztQdcA/I/dYvLBU/p0iPFymdwiA xCBQ== X-Gm-Message-State: AOJu0YxvTgdMb7uG4ff+ljqKJFdUE4Cz0mGJGWuBQZwQ7VIKURdKXYOP ZUb2HHPgKBovKRHHwZSYgIw3JC/PRz+O2HzSWZqqOQLIxImkuRs5jAsh8A== X-Google-Smtp-Source: AGHT+IGgv0XUN5bKLEPi7b4Re0vRnmOwsCXuBknRS42f19oPB8qTUXyxT+MOUtOJBBN+zMBoGyOVCQ== X-Received: by 2002:a05:651c:198b:b0:2e1:c636:168a with SMTP id 38308e7fff4ca-2e51fe57d59mr4998651fa.24.1715293940181; Thu, 09 May 2024 15:32:20 -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.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 15:32:19 -0700 (PDT) From: Paul Donald To: OpenWrt Development List Subject: [RFC PATCH 11/14] config: clamp ra_retranstime Date: Fri, 10 May 2024 00:30:43 +0200 Message-ID: <20240509223213.97389-12-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_233228_686667_8404366B X-CRM114-Status: GOOD ( 10.67 ) 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:231 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 Attempt to be helpful. Signed-off-by: Paul Donald --- src/config.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/config.c b/src/config.c index e0f2d80..160d7db 100644 --- a/src/config.c +++ b/src/config.c @@ -951,11 +951,10 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if ((c = tb[IFACE_ATTR_RA_RETRANSTIME])) { uint32_t ra_retranstime = blobmsg_get_u32(c); - if (ra_retranstime <= 60000) - iface->ra_retranstime = ra_retranstime; - else - syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", - iface_attrs[IFACE_ATTR_RA_RETRANSTIME].name, iface->name); + iface->ra_retranstime = (ra_retranstime <= 60000) ? ra_retranstime : 60000; + if (ra_retranstime > 60000) + syslog(LOG_INFO, "Clamped invalid %s value configured for interface '%s' to %d", + iface_attrs[IFACE_ATTR_RA_RETRANSTIME].name, iface->name, iface->ra_retranstime); } if ((c = tb[IFACE_ATTR_RA_HOPLIMIT])) { From patchwork Thu May 9 22:30:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Donald X-Patchwork-Id: 1933686 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=s7hcHsWY; 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=Mnyxxx6E; 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=LHmxjLHS; 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 4Vb7xS3hlwz213s for ; Fri, 10 May 2024 09:48:10 +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=i8F1pd9+oLswjeQVrFJd8ufi10NWlDpNQNdKDB/Je0g=; b=s7hcHsWYJRl5GO WqpQkxofxF3UZmI5Qrjb0fTsvVsUra+pfB2BWC0UZT/rI2jPgGEI7WSWkjzDZjX8FzX7Dcm+r6vhr SZZqs/LBVQClAusinWJME4wklyzYI6u6ZcGcptDvFocXQUfsL29+BMwxUJDW4x+9qssL5VkTKIlfT YR3i+nOh6NW/M+ymH7wXh6Ut84TRh2m/DNObDpCUZvI3ZYyk7Lb9cBzL0HzGv/1nYsUhkaD7UuRJq 1G5v+fe3fD8sMQXoFhMCj9DMRPEiuNTGT3MtvuOTYI3BTqVJ/k+loVxMxdtSYfP4HbS6+AlyiCDdz kzTJudUrE04lo++ddqFA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5DTK-00000003Ixd-3LIS; Thu, 09 May 2024 23:46: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 1s5CJW-000000036tf-1XEK for openwrt-devel@bombadil.infradead.org; Thu, 09 May 2024 22:32:34 +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=2vc4ZtSuX5JU71cwsGWyFAfe+kgVrPbAmRus5EZBUA4=; b=Mnyxxx6EskLtGKEJjt/kpoqGIZ C8sZHWxJ0TBQBL4vr6D6HkoGdS1aYppKkdAp+MKRUf0g8rEwpT18GTxWBKnZp42rt2DzyCruA3nq8 eKpt/Zfxmwv6EaIbKTH2MncoIhQdqB7qdMeSEQN8Wyb2gX0Fe28VxH3bSWvU13tZGUy62NF6gkyyS 1lYqh39uLianeYr6fzHHuk6ydGYWIGj1Y5xofKGyZs9wHUVAQnsSEqdvQtQU/5z4E5RH5+vnfNelR GNQ4HD9dOFkq9nNS0Ihv+yHn4nuy5gY26lVYiVR/nKI9Jhy2RdkQpleToYxzY+GQ9p5zzFuszaLq/ 975czkPA==; Received: from mail-lj1-x22c.google.com ([2a00:1450:4864:20::22c]) by casper.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CJQ-00000001aJp-2Bnq for openwrt-devel@lists.openwrt.org; Thu, 09 May 2024 22:32:33 +0000 Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2e3fa13f018so16119271fa.3 for ; Thu, 09 May 2024 15:32:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715293941; x=1715898741; 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=2vc4ZtSuX5JU71cwsGWyFAfe+kgVrPbAmRus5EZBUA4=; b=LHmxjLHS6Jej7ZvVLp7tTzTC8FIjeHCEuyzn3wAeMCexfj5Pcp0awGrIx00Qg0Qc+u mPKtaZ/jNx9dTXpHq49aUCYeA4HrfbBIrfIR5//gxOsaA2R7/vmFPT5jh+C4M+QL5rzn y1PjVgboFfzHoS0jYkoh2wYkqxZc9S3YkUOt59JoYlNyIOw4OOhp/VGZ2LUIXnTwZapl pHVk6/MrkCOWHjVy/G2WbkOxyatKFIhHLU1bv32m9EY0R7Yk8c4Kc4tVYKbh7Zy6tqw9 HrvlYEL/dRwpMWveYhSLsvgq3rDic4mefieRPoPdVsHRNqxE0u54owM1BcSyd9YER92/ Y1iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715293941; x=1715898741; 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=2vc4ZtSuX5JU71cwsGWyFAfe+kgVrPbAmRus5EZBUA4=; b=sqaf6KQhDUpVm/bNM9ek4OOGB+XC+QRK6mpkm81LMYImhmfWtQbEPLT1A4p84XWsBy RtZypqvFGmmCm3LIuqRIBfbqQ1yRbUWaZQlzYEoarF17NjbN5eUUB5LhAtkyaxXv7feW cI0c6vnoLjOWBlfOOEhRO/Yx0ZctuYmEWJ+q10VHfUpDwX+t1CiTSczXgPVoWdDi9dNt r4i7kdE2tgsXDtMukS4AGfKz/WQIs3oVlEYVeU0jwTGWfYoJ4acgalJY/faCVdv51Q4u DZCv8K2xSSgY9SiZZEuYwrTU6GJQoTAJh2crD21HB9U1rt8T+c4iRuBxOz3fIV4JQFwz VwzA== X-Gm-Message-State: AOJu0YwKlLGWtAt1CGxbu4jk5IujYtoyh1hr03miqxjAPtmDUo8/9idU YNJa2ooF2kfAl1T1zHuB6uGytRllj9b+VxV/6dEjfsZyecqHRElnz7aupQ== X-Google-Smtp-Source: AGHT+IG9SUMW27TURqAOsc787xhfy8oO0cDxKBDilorQXsbo8kap7azhczsosh3rL6xm7O7LCDesSQ== X-Received: by 2002:a2e:7307:0:b0:2e0:83a9:e388 with SMTP id 38308e7fff4ca-2e51fd2dd5fmr4331481fa.9.1715293940672; Thu, 09 May 2024 15:32:20 -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.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 15:32:20 -0700 (PDT) From: Paul Donald To: OpenWrt Development List Subject: [RFC PATCH 12/14] config: clamp ra_mtu into 1280-65535 range Date: Fri, 10 May 2024 00:30:44 +0200 Message-ID: <20240509223213.97389-13-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_233228_719364_1C4B7BA8 X-CRM114-Status: GOOD ( 10.38 ) 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:22c 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 (ipv6 packets can be up to 4GB in size...) The old logic had a logic error of || instead of && Signed-off-by: Paul Donald --- src/config.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/config.c b/src/config.c index 160d7db..f4eaa3b 100644 --- a/src/config.c +++ b/src/config.c @@ -971,11 +971,10 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if ((c = tb[IFACE_ATTR_RA_MTU])) { uint32_t ra_mtu = blobmsg_get_u32(c); - if (ra_mtu >= 1280 || ra_mtu <= 65535) - iface->ra_mtu = ra_mtu; - else - syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", - iface_attrs[IFACE_ATTR_RA_MTU].name, iface->name); + iface->ra_mtu = (ra_mtu < 1280) ? 1280 : (ra_mtu > 65535) ? 65535 : ra_mtu; + if (!(ra_mtu >= 1280 && ra_mtu <= 65535)) + syslog(LOG_INFO, "Clamped invalid %s value configured for interface '%s' to %d", + iface_attrs[IFACE_ATTR_RA_MTU].name, iface->name, iface->ra_mtu); } if ((c = tb[IFACE_ATTR_RA_SLAAC])) From patchwork Thu May 9 22:30:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Donald X-Patchwork-Id: 1933677 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=Rsj8t+h/; 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=Ua3XmIAH; 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=ROPMnJHV; 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 4Vb6Kh69xJz213s for ; Fri, 10 May 2024 08:35:36 +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=+WIsTNpgvG+WU6zdtXAPpY2Ev79vSx72U0OiSoiWgAA=; b=Rsj8t+h//KfeIw 6x7bw1Tb+X+zm3kl8s/4q+TWSOaLDkBa7BSKbSy+QG5BLXswctMa19EXR/xqBnQp8sZrLFqwrc4pC hcfCnGOP4DPfJ51tH9I5VFK0buG4kfp+ZrgFmnakvfAw/4ZbQ3jkt0yu4zGzAJ7Q9TegVLGgCKevz hsK2rlt9CUkhn8I24uh0D/RDnXKN/VkDYkSCCOspf/P6zynozTzHsgn7ps50P81yjdr9ROlTbTIXk eQ7CGKuOtLp7iLdO1w7VG5d9xWoWj6untHmv8D5Bp9/BYe9eFIK1O2YPmKzJHXt5yBmbcjLG5u06h 5gxwCfg0czL0eG3N/3qQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CJq-0000000374a-027L; Thu, 09 May 2024 22:32:54 +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-000000036uA-0d6e 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=WcUJTUbwKHtTX0Znp0u9MNqMJwpP8UxQ9+1vCvrnTIc=; b=Ua3XmIAH51FTJgWWc+dLlWl0sS WrTuk73lPzYvX24jg9JrYyX4sLUhMTt5HbJnZf5qG9NLwAZrAvpyow7gX5F4zi1ISU51uilYlIKXp feS3/KMVbmUHOtFHTs0/R0/yWfsCG8WHS+/AqFmtWK/HOZ/gA93/i5PpoyacmUoQcom7fL47FhE3S 3pCfKqTZSxxEnZDvhJtWdZ4vrXb2dq12aYnN+0ohckfsM9aGhuNpIc6p0wGA4XCI6NsBufHILYOWd kBfVuLVZ/qvZ2F4tR85JA8uu9PYR4CMrkOL4Ii8C2XyjY170E+ib0LBVGQ7OxvTgds9ugyGLHq8oB 5HsxFTBw==; Received: from mail-lj1-x22d.google.com ([2a00:1450:4864:20::22d]) by casper.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CJQ-00000001aJq-2VSP for openwrt-devel@lists.openwrt.org; Thu, 09 May 2024 22:32:32 +0000 Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2e1fa824504so18176291fa.0 for ; Thu, 09 May 2024 15:32:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715293941; x=1715898741; 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=WcUJTUbwKHtTX0Znp0u9MNqMJwpP8UxQ9+1vCvrnTIc=; b=ROPMnJHVOzmOkCPOM4w/Yc06SVjZCsY8U6V8cTNAnF0GGuT7hoshKr3rXp+Fo6ec5l JnnbWfHqXR3N2Z6leS6G5wzeWrYlzqvIgO10U7FmeuC5eoUS55kLBsGQJAv5Ssr1hDBB f6IMQAYbjSXvgDROV2vXYbUGtgyIu1/Q3Taz0K5Z4bg2ZBSOWWJ+R66xz1lrVRkWdj6x NJABaAU4cGhvczLqU6IN28RVwjJRE/yIB8KHFUv4ZZTavtWm5pZS9kMotLaH+mi97gw/ 0j8zptI1sNpCEMxrEsqUUXYfIWGZ7iDEP6/4CJy04DU4N7PyI+UqnEa9HY2hzy6CDbrZ UKHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715293941; x=1715898741; 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=WcUJTUbwKHtTX0Znp0u9MNqMJwpP8UxQ9+1vCvrnTIc=; b=jJYPLpNpeZM51mPQGu872OhgcoEWTERUF2p/o44kYUHHL09a7cgUFGJWrJXBj5aJqX nTXFwO3LkrxUQTdn3QclEUknvFPHbEfcK9AG5V6QEtfF563BfEUuWnXuBpPRNt3iUuB1 npSfXVxnktz3bvKUNU0Ty6ehYt+L5QRf9TI0mc57WH/3zQKVlXXg4tMMpZJNz39C8nVj MQU7TTULFxcAsQCzGVdTtBHXfntAprRvsMOXDFPnS5TgaDoalN9oMb/Lq0tLWxIB30eK b7dA2MXAqckdau0NA645Sl5YYVCZYBr9nwR2SZ6B8/B4zkzBwHxZAK1TZ1kQGXV8pS45 OaSA== X-Gm-Message-State: AOJu0YzNUP+uKUA2Sv7UTyIz5he0tar9bb0pL37PT8uEGTaK8f8ViHS4 52oiKyztBYkFWIWzepjxZXAjvjddQ+9cOrUpN7UmyciHVltBeaWbAaCSFw== X-Google-Smtp-Source: AGHT+IE+j4xXQcEtZCgIlzCgUO1vim+wF5jshPDAsoaSPCyaK3aTM7OqwwfqsYuwcW1uwsO3AVi67A== X-Received: by 2002:a2e:b6c2:0:b0:2e1:ba1c:efea with SMTP id 38308e7fff4ca-2e51ff4d69fmr4487581fa.19.1715293941054; Thu, 09 May 2024 15:32:21 -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.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 15:32:20 -0700 (PDT) From: Paul Donald To: OpenWrt Development List Subject: [RFC PATCH 13/14] config: clamp dhcpv6_hostid_len Date: Fri, 10 May 2024 00:30:45 +0200 Message-ID: <20240509223213.97389-14-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_233228_721992_525E9C0A X-CRM114-Status: GOOD ( 11.54 ) 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:22d 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 Attempt to be helpful. Signed-off-by: Paul Donald --- src/config.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/config.c b/src/config.c index f4eaa3b..4d35548 100644 --- a/src/config.c +++ b/src/config.c @@ -896,11 +896,12 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if ((c = tb[IFACE_ATTR_DHCPV6_HOSTID_LEN])) { uint32_t hostid_len = blobmsg_get_u32(c); - if (hostid_len >= HOSTID_LEN_MIN && hostid_len <= HOSTID_LEN_MAX) - iface->dhcpv6_hostid_len = hostid_len; - else - syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", - iface_attrs[IFACE_ATTR_DHCPV6_HOSTID_LEN].name, iface->name); + iface->dhcpv6_hostid_len = (hostid_len < HOSTID_LEN_MIN) ? + HOSTID_LEN_MIN : (hostid_len > HOSTID_LEN_MAX) ? + HOSTID_LEN_MAX : hostid_len; + if (!(hostid_len >= HOSTID_LEN_MIN && hostid_len <= HOSTID_LEN_MAX)) + syslog(LOG_INFO, "Clamped invalid %s value configured for interface '%s' to %d", + iface_attrs[IFACE_ATTR_DHCPV6_HOSTID_LEN].name, iface->name, iface->dhcpv6_hostid_len); } From patchwork Thu May 9 22:30:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Donald X-Patchwork-Id: 1933687 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=4CiooVWD; 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=L/rnctP4; 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=A+KScD+v; 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 4Vb7xS2J8Bz20fc for ; Fri, 10 May 2024 09:48:11 +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=/I+NI6gpe3MuqWoc3sIA4ScW0AAqCnTbgENEGW1UU+k=; b=4CiooVWDpYV8Ip vvTgCT23yo/jLIL5xeazl64ojk4rOc6KGnjoiZvETaI+2hFbuYl5AmjxwGoxpnHCGqALCMfqOfVGg SDchSWt5AFZSH0de/pnK1qhzkxpRXHaKCxqDJWOUVXott7+CKnlEhRkZJacA2hx3EQAXI8eXsX/6I v9ZtcEL5BbvO4lNtqj+jN2958gy5UqEVKGAXHltHC1cQnNcYju0FfZPG+omLWoK4hOuVgJKJOPVQY 0JYyXrFX8Hr+jDRXa0HH/2JAcXkZj+xB4Nnjog+TAcz/Qh792DsZzZZ+zoNv65V7N6DbRV368phh8 /lLJEPdc8zaK6Bz47YiA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5DTI-00000003IxD-1BmN; Thu, 09 May 2024 23:46:44 +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 1s5CJV-000000036sy-1bId for openwrt-devel@bombadil.infradead.org; Thu, 09 May 2024 22:32:33 +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=r69MFA3Gc/QVFtBSPV45hekmoQJarL3vYkRsRs3pmXk=; b=L/rnctP4ti8hq//TS3FbQguz/V ZsnFiEC8FZYlRXIhLNVb7lQwjb9Hlq9SjDvnIRfTtAsOF3D5QWSkaPkxI8WHmlRIIk2eAABL10o5W 7bAwNSMrgEKzbubQ+3a+gkzJ+K4VD8ILhym9yqe6rqZlpL7qe/in7unliM/MxywYiIsQHRU6y/6+g Kqt8ycDto3yroi/D9ikljMgd1omhE1Asq1NaCDz4O9RINzhsPrYdwBDq+vVp2/IB2i48HWf1REb5J Fu+BJf69WLJvphXToNaaEuWuU4wd+3UGbBoDtGlq1YiLTXyMA3pusblF93Bp4CP+b2qZUr1XZ2p8x M13LfIRw==; Received: from mail-lj1-x234.google.com ([2a00:1450:4864:20::234]) by casper.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5CJQ-00000001aJr-1oZh for openwrt-devel@lists.openwrt.org; Thu, 09 May 2024 22:32:31 +0000 Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2df848f9325so16326461fa.1 for ; Thu, 09 May 2024 15:32:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715293941; x=1715898741; 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=r69MFA3Gc/QVFtBSPV45hekmoQJarL3vYkRsRs3pmXk=; b=A+KScD+vbaUHuTSufmdIKVN0srySb+Y2V/mh6ScbldBq35airHJ7DYRY+b0AtkGq+s FtDOazS1MuYcHmlb0LHrs8ZNr/uVcHLd7qMpKMA1a64QqGIYwDyL6Iwq97RilW2rQmWE Kd2UfTCak9ewZravSXfUkMPFtBMzYVUHsO/BtUJdA31CutdlOwuDbbA6qTfQTAms0/GE Cnf+vOklJMbRmkEK8PH5c7V9fdcQHiviNT0QPPTCuwTOEXA7BYVSRiEul0ayHNxqiSGL /pS5hVE8tjPLVt4S69HRmRbyoapuCgh+VJICBlTfzuG/F7ZscOgbP2Uu0t9O0MdRcKI3 aZ8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715293941; x=1715898741; 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=r69MFA3Gc/QVFtBSPV45hekmoQJarL3vYkRsRs3pmXk=; b=CrXDqHKAJIXJHqeaircQBHPPoCkSwF/gtLRvU9bhG1jiwAA5ELPMiKDlSkh0lOWk2H bVpxkRd+wj2XT+vdSGxaX4l2wGEAKdg9N3yU0OHg5GevOXwhDXbwpoBktF8iQ4Rc1HHN upZB9zA98Tjx8kka425vTZwA8dtC6V859tLB86j5043RXtuwkIH7DL7CypyGb9x9rQE+ xjavmN1gTBOjQAGlJ3f3ioyB5VHnffONVbAYctHvvM8NgNGT/LOVVlCyFJ72/Bxw8+kO 4MDC44NBtMnSUzKIEDA9KteMkgmoY8c1GlN9pASmwuA2D7oJjKH8ZTwpR+VtiNRy82+9 gAXA== X-Gm-Message-State: AOJu0YzZC3e7cV8A4tdolSPX8sLj4sycWfoX0gbnA3y/xbxJhqp5pAf/ nTxKxD0gVsYnHl/TG4+TZOakkberdrTCsAxGMYoiFoqfpkpgCUXfjNTACA== X-Google-Smtp-Source: AGHT+IFqXP3wRD831lrJdTdr5Aldyn4tb6od/v4DzNv4n0WhsUjb5DeS+TycgFQPRwpwIiH3Ol0Xig== X-Received: by 2002:a2e:6812:0:b0:2df:49b:27f1 with SMTP id 38308e7fff4ca-2e51fd2e03emr4173941fa.4.1715293941434; Thu, 09 May 2024 15:32:21 -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.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 15:32:21 -0700 (PDT) From: Paul Donald To: OpenWrt Development List Subject: [RFC PATCH 14/14] config: clamp dhcpv6_pd_min_len Date: Fri, 10 May 2024 00:30:46 +0200 Message-ID: <20240509223213.97389-15-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_233228_594816_739F6E39 X-CRM114-Status: GOOD ( 11.83 ) 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:234 listed in] [list.dnswl.org] -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] 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 Attempt to be helpful. Signed-off-by: Paul Donald --- src/config.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config.c b/src/config.c index 4d35548..7484519 100644 --- a/src/config.c +++ b/src/config.c @@ -883,11 +883,11 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if ((c = tb[IFACE_ATTR_DHCPV6_PD_MIN_LEN])) { uint32_t pd_min_len = blobmsg_get_u32(c); - if (pd_min_len != 0 && pd_min_len <= PD_MIN_LEN_MAX) - iface->dhcpv6_pd_min_len = pd_min_len; - else - syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", - iface_attrs[IFACE_ATTR_DHCPV6_PD_MIN_LEN].name, iface->name); + + iface->dhcpv6_pd_min_len = (pd_min_len >= PD_MIN_LEN_MAX) ? PD_MIN_LEN_MAX : pd_min_len; + if (pd_min_len >= PD_MIN_LEN_MAX) + syslog(LOG_INFO, "Clamped invalid %s value configured for interface '%s' to %d", + iface_attrs[IFACE_ATTR_DHCPV6_PD_MIN_LEN].name, iface->name, iface->dhcpv6_pd_min_len); } if ((c = tb[IFACE_ATTR_DHCPV6_NA]))