Message ID | 20240405111025.26478-6-newtwen+github@gmail.com |
---|---|
State | Superseded |
Headers | show
Return-Path: <openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org> 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=GAJvw5oi; 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=VR9e6UGe; 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 4V9yJP4K3Wz1yYh for <incoming@patchwork.ozlabs.org>; Fri, 5 Apr 2024 23:21:09 +1100 (AEDT) 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=xiKRnM7N/j4dDgeQsZ5iSK02vgnStQvai97+4llXZCI=; b=GAJvw5oid56ZBSq21xl6VhlTEU tsDFdUukpBkcNAynFbnCDTiUMEN1Ep6Q0HlXR4LZICnVqcbWkF/7nfZbJzO7Mf3qhofC6GA2gh59z 7eGmvSGZF51JW9tXUYrW3JNbs28hK6QOgtWYJmNqC8C4AL7e6Meo6VlTmHaMk+ERPbFuxrhAdLoDI TrwR/R+l5ukJ8DkHY1Och2W9dtmv/c4qpt6HtLfj7W7qt5E92L8x91Huy02rCWx7PyHxX1X+0tnRz Uhg8v/Ym9uKG34xlV/zZBtjSdE53YEsLPwL32p/LnYdjVzT62/LsBccchuZS1nBJpDaXVnZ58JJEu aLHQ+Y1Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rsiY3-00000006tLc-1Zg2; Fri, 05 Apr 2024 12:19:59 +0000 Received: from mail-lf1-x12a.google.com ([2a00:1450:4864:20::12a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rshSr-00000006bej-3F48 for openwrt-devel@lists.openwrt.org; Fri, 05 Apr 2024 11:10:36 +0000 Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-516d6898bebso277822e87.3 for <openwrt-devel@lists.openwrt.org>; Fri, 05 Apr 2024 04:10:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712315431; x=1712920231; 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=NBixtORa4eb7BRTkueJQVHIRYrhOsaxMVhEdhkJioqU=; b=VR9e6UGeGwR2jMneTh6v91epZa5yt/gT5cRJ7Z6xwMs9MxvdthLsyjYJhqzINH7+Lm l1/jA5lOB4g6yF6NBsoU6pB6Qyad0DGFyhl4LXQSigX3JVMYw3+eQ0eT9Lu8q/mFn9aS GINS/uPHih2qvFCiskO6UwUG0toTjri2xBfoK3EwShp1W6FJWfLXjTuHOEmANP/x/6ON 1rcdDld7PTvdPfmYFEQBirXeOSAZSPFcrvIEP1CKbuf+ksWICkKAhnNscBysOuw3f5Le dk/Nm4F28Uf2N6lRbkf+PUPZ4P8zePpK3AotZEnE2XivLD8LHQY+NOWSpR2GfP+PHb+X ulVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712315431; x=1712920231; 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=NBixtORa4eb7BRTkueJQVHIRYrhOsaxMVhEdhkJioqU=; b=mZ8sE94evYy8Izz5RzcEJIRE+RHU0TKnajqBS9P1J8RHncATbKUVghEm170dg20m3N QJVy6XTC7A44kYaBySSN0r+9kTlEt2wS5LpbGliXLj9/s50CKGErpL2vu+Qj2nxz/Q1L aLB1s4Y1O2zJLS2/xxWAHJQuHiA2tAv4mZOeLQ1R+AfWWmRghVTKorAdm3BFYA8ugr6D mdLh/EK4BYYDighdJtWbuXDmlHs0m/JDD12xql8t7P+G6cSz5eVUy1NQMWsnXbafFrzv 5alKzhtw2ocC9m7V5N5/rHP2JIKBJEQ8jC3396IZUBhVqqtqNCnqVkoJLGo63K1Ryetn V2OA== X-Gm-Message-State: AOJu0YwjHXuT2cKqY/hCRl8smG/iiiDgUaAS6aLGS88mV5S+KvZ4bBBd j1K08fZ/0mZ9c8y+Qg5tZvdkWfu+g291s1sNdNzfWi3SeoSE1iBhoAOirX/vnVONaw== X-Google-Smtp-Source: AGHT+IFy/OuNXcU8js10iXzjKlM0cvO6mE+jV+wWGAhARjNhynMMiyno9cr4cY7xbwKUFzerH2FlmQ== X-Received: by 2002:ac2:4a99:0:b0:516:c860:3c70 with SMTP id l25-20020ac24a99000000b00516c8603c70mr685265lfp.57.1712315430605; Fri, 05 Apr 2024 04:10:30 -0700 (PDT) Received: from blackhol3 ([2001:9b0:40::cae3:cb03]) by smtp.gmail.com with ESMTPSA id g21-20020ac24d95000000b00516cdadf377sm163719lfe.137.2024.04.05.04.10.29 for <openwrt-devel@lists.openwrt.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Apr 2024 04:10:29 -0700 (PDT) From: Paul Donald <newtwen+github@gmail.com> To: OpenWrt Development List <openwrt-devel@lists.openwrt.org> Subject: [PATCH v2 5/9] router: Limit prefix preferred_lt to valid_lt in accordance with RFC4861 Date: Fri, 5 Apr 2024 13:06:49 +0200 Message-ID: <20240405111025.26478-6-newtwen+github@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240405111025.26478-1-newtwen+github@gmail.com> References: <20240405005510.19778-1-newtwen+github@gmail.com> <20240405111025.26478-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-20240405_041033_984353_B0233445 X-CRM114-Status: UNSURE ( 9.76 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.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 Follow-up fix for bc9d317f2921ae6b529f2c9f8de79b75992e206f https://www.rfc-editor.org/rfc/rfc4861#page-44 Content analysis details: (-0.2 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:12a 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_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.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 <openwrt-devel.lists.openwrt.org> List-Unsubscribe: <https://lists.openwrt.org/mailman/options/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=unsubscribe> List-Archive: <http://lists.openwrt.org/pipermail/openwrt-devel/> List-Post: <mailto:openwrt-devel@lists.openwrt.org> List-Help: <mailto:openwrt-devel-request@lists.openwrt.org?subject=help> List-Subscribe: <https://lists.openwrt.org/mailman/listinfo/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=subscribe> Content-Type: multipart/mixed; boundary="===============6374971413226308195==" Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org> Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org |
Series |
odhcpd patchset
|
expand
|
diff --git a/src/router.c b/src/router.c index 3890c0b..a1a7829 100644 --- a/src/router.c +++ b/src/router.c @@ -603,6 +603,13 @@ static int send_router_advert(struct interface *iface, const struct in6_addr *fr valid_lt = iface->dhcp_leasetime; } + if (preferred_lt > valid_lt) { + /* RFC4861 ยง 6.2.1 + This value [AdvPreferredLifetime] MUST NOT be larger than AdvValidLifetime. + */ + preferred_lt = valid_lt; + } + if (minvalid > valid_lt) minvalid = valid_lt;