From patchwork Tue Apr 2 13:09:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Donald X-Patchwork-Id: 1918812 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=GbD8QFlO; 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=C3NzAyME; 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=evFukSRQ; 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 4V87YM2Lvlz1yZ4 for ; Wed, 3 Apr 2024 00:11:03 +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-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References: List-Owner; bh=xQRB5lULpom55ob6Yk2NTueuVfwdSNpxUcWrV7xpezk=; b=GbD8QFlOKZV7t5 oQxlToQVrDD7KcnB98tMaZC8T6Bc8G/QglzKB474TKEHJYxjiT/3VM0az82BHG4y1dMRfFO4dTYkE OfQFT8Hx9Cv6Kr3vPwVvzaC/RxkB4/cUGrI2Bqams/77qQHPV7Nmws2UdXb86dIie1blICynFHTON X71YItdLdC7ZsM/M4kX6itIUMZvv0tmKmFmS01XlOYHxkgphHf1hhCmAx4ABGp8uXuhI+LBMZkvrv HWuDaCHTKsFnAnpn8ibVaT3Qnevixv+58JGdxTyAFTwERwT5iLON52wn6bEvgUTIx94tAhRduqkkh owcAdlAGdjiowN7timuQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rrdtS-0000000BGTE-2tQg; Tue, 02 Apr 2024 13:09:38 +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 1rrdtJ-0000000BGOk-1G1u for openwrt-devel@bombadil.infradead.org; Tue, 02 Apr 2024 13:09:29 +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 :Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=SFkaH1lY1I7FNwh2cjw6ExW+UnS8a0ROCDxE2G7x2dM=; b=C3NzAyME9ij3LQbnAzQl1Y5mBw CNkdHIc1yAgYBMnwb9FWYn0ZRGL6VW95Z1ygAMggqxn1JahY+TmauTLEyCBh6JUNZ4AtCdWPcdlp6 uURk/GNUi9Rkr9BqtwbgMFlUjYuKtp4750pDvjsNmnnPMf/3FJvjy5DSMJKkcCuclLJPo5tiik3PR t68biQczvXDgGOC5KQ0eru5WUkjKFuK7Bkz1ah4k3Hv3z4te96JqJqtVWbHwAfRx//pnqSigTAOwC 7BjxojirMdrzu5H0pAtFftt5PM08+Vh9eI9EfZFdK314bI0+I/OSmf8n2ru6Bp8ziT7Jqzqd/jBNv lSKXk9vg==; Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rrdtD-00000003e5d-2pqA for openwrt-devel@lists.openwrt.org; Tue, 02 Apr 2024 13:09:27 +0000 Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-513d4559fb4so6369290e87.3 for ; Tue, 02 Apr 2024 06:09:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712063361; x=1712668161; darn=lists.openwrt.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:sender:from:to:cc:subject:date:message-id:reply-to; bh=SFkaH1lY1I7FNwh2cjw6ExW+UnS8a0ROCDxE2G7x2dM=; b=evFukSRQKrMmDtDyHpeVUeX4lfJP/ABiYzVvSwTnsb/IXNHM4pl30d2GA0LQUJxT1z KyHpLSQYjfSj86D392Pdii/baF6BwvOu0jwaYUOZrM3gpM4WtvfivyBTMkt5njBwG+WX wwZOF6dKMUVdXhY+f6y+LZg3JCO2Xt1ttp3ENohK+n9ziyHA6GqcDOR1BTGpdV2vBvKY oY5Z+zabcVEZp6SYumiCBsqQvZfjApSYf7Q/bUO31MOmFB3JcIf5XD8rmUDjS/eMrQ4H Or1TIfZ1F79rRP071HLNCHyXI9z2eMwEninzhqiGG67dqGKzqLxoXCERCra9VMiwd8sy Kkgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712063361; x=1712668161; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=SFkaH1lY1I7FNwh2cjw6ExW+UnS8a0ROCDxE2G7x2dM=; b=X03R7cw50Y5bfKuvOiX+yzpJvq3TdIrYdCen3tYgr4eOeNo+ho9nOzTbnB2EZ7tmyh 782TbyIWm8cMttYzKmez7XA+rayV6o8OObSqCdsnga8DE1gQ9wvY6SgP+UGIqYO+dt1o owF9rQHjeBb9tj2NpqyBQL5LME5BHxrPjAsPuGw7CjgLVkOi278Y+UA4vC0nsxgtv/gA +UZDzlVYebNs4p5jaP/OUYho7dWzaZerj7HYI09wI8tk4Kohz8wfIumrMSRqu3HE2wUk rNkFrhOWuPvX9csk6w6FvLfdXFLLXB+dGCq62dhjV/yL5PMwdxVH1nFxWu/EGYueuQmL 2+uA== X-Gm-Message-State: AOJu0YwSwq0G38oaZrNFk1JlLA9HqyT1TIFW/qsaAS1L2Y/gxaE3NJAJ 10xYbZgUYsACrIBM+IVQP7SoTAarrt7j5pYw960p9LSHkmWWGiLtVqiPNLuc X-Google-Smtp-Source: AGHT+IEpRUbd1pzdRZqVYN1CDS5ANh797CiseEYit1wEh91DLoDhfv433gch/chTETUkUVcIuCVJ4A== X-Received: by 2002:ac2:4d07:0:b0:515:bc26:24d8 with SMTP id r7-20020ac24d07000000b00515bc2624d8mr9448482lfi.66.1712063360542; Tue, 02 Apr 2024 06:09:20 -0700 (PDT) Received: from blackhol3 ([2001:9b0:40::cae3:cb03]) by smtp.gmail.com with ESMTPSA id m15-20020a056512358f00b005159fa03501sm1704109lfr.302.2024.04.02.06.09.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 06:09:20 -0700 (PDT) From: Paul Donald To: openwrt-devel@lists.openwrt.org Subject: [PATCH 1/5] dnsmasq: add handling of `filter-rr` to init script Date: Tue, 2 Apr 2024 15:09:15 +0200 Message-ID: <20240402130919.58881-1-newtwen+github@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240402_140924_011820_9D730C50 X-CRM114-Status: UNSURE ( 7.16 ) X-CRM114-Notice: Please train this message. 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: dnsmasq v2.90 introduced `--filter-rr=[,...]`. uci config usage: config dnsmasq ... option filter_rr 'AAAA,CNAME,NXDOMAIN,SRV,...' Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -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_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 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.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:131 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 dnsmasq v2.90 introduced `--filter-rr=[,...]`. uci config usage: config dnsmasq ... option filter_rr 'AAAA,CNAME,NXDOMAIN,SRV,...' The dnsmasq instance internally builds a linked list of RR to filter from the individually supplied parameters, so it's harmless to provide synonyms: ... --filter-A --filter-rr=A ... See https://forum.openwrt.org/t/resolving-query-type-65-to-local-address-for-ios-clients-in-dnsmasq/179504/23 Tested on: 23.05.2 Signed-off-by: Paul Donald Tested-by: Vladimir Kochkovski --- package/network/services/dnsmasq/files/dnsmasq.init | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 138a913f87..15cf194673 100755 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -973,8 +973,10 @@ dnsmasq_start() append_bool "$cfg" rapidcommit "--dhcp-rapid-commit" append_bool "$cfg" scriptarp "--script-arp" + # deprecate or remove filter-X in favor of filter-rr? append_bool "$cfg" filter_aaaa "--filter-AAAA" append_bool "$cfg" filter_a "--filter-A" + append_parm "$cfg" filter_rr "--filter-rr" append_parm "$cfg" logfacility "--log-facility" config_get logfacility "$cfg" "logfacility"