From patchwork Tue Apr 2 13:09:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Donald X-Patchwork-Id: 1918809 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=YDhmEyYo; 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=i7Z3ZOOA; 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 4V87YK4t0Pz1yZ4 for ; Wed, 3 Apr 2024 00:11:01 +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: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=tahf/BoszYo63vMCebjohrdm1ZKuAIb73I4uvdQ7D9w=; b=YDhmEyYo/xoTu8 nUANNVkNzIbYMYqRm+2dUEonN1pIzGtmi9k//7pbCm4gzAH+D9r+gpfn+1qydBCx2eLbQTPIfO3VB /kGQDLZqT4ohp1pLEaAnZNMPBeCw2dfeiwO7TrASSS596sH/7WIYxbGTkjHRkucuaoqSl2tgHenKG vOe6slwTGzhoQMwiysC2zN3pT/wsoq3ys7ak9iCEHEDvqj5p2IPoy9mkK6UdNy+WNWMCJXce0kl7V F47eT9k1pt3SadLgDMPiEVqPim0b3PAQnYV+m8ld5DXRk3erpp5Cxhhmidemzaht2QMbxGhw1hKql 2a6sEdMY6YCRMiXpYLGw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rrdtU-0000000BGUR-3pEn; Tue, 02 Apr 2024 13:09:40 +0000 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rrdtD-0000000BGLH-0hKb for openwrt-devel@lists.openwrt.org; Tue, 02 Apr 2024 13:09:28 +0000 Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-515c198e835so5908139e87.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:references:in-reply-to :message-id:date:subject:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=EVEFa8SVvZRmYH0/UVoMDNFY8o43iPHJ9rmYpVQ4N7U=; b=i7Z3ZOOAeVMU1MYzqnRjT6brSJv//fOrKAc8ukvBsiJ3D/v5k8LN0JSQXJToINFGN2 9K6uHwahv87DAr5PTCecjA75+A0SfM1gA0MDVOxivHetT23kBHtGui++iTJ8Fuwjw+xN cDX6qcagnw8mSo7+yB/aZe/lKQ1Sx70rkoNQkEoSV/j6P6OlFW3LmNQ4EieBD3wP9nWe ej/4NSPWpS5Za6L5xayayQTfSywz2lFdJS/i0jrG13UrkNMurbOk50S2wcM2xbv+Is10 ooWA49m6VMwpmeHMwJ83IO+EV8cLkxX2bOQDtZJVic9E8tC0bV3weQB6saMBOIyRaMcX 0Xbw== 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: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=EVEFa8SVvZRmYH0/UVoMDNFY8o43iPHJ9rmYpVQ4N7U=; b=sWneknEdYz//rim7MXqyxCUGXL3FzcoWYSQGSEu8lIO/zyl1c6OE6dj0575uVfYa2M Rcx0XnPZzGxwVXxvLRG5Zz9iSbOr8wP7950e6LeDe9iLOinq+y7YIWQiInBk5NLtYuLm 63NVJFYhSq9w2O5a1ZJNdIUZlWayJ8WIM4vTDCDFJsT94NZErEEjE3bz6PGOZja8Sgxf Vgiys2NFCMdNMKPss8sib+whfZEWQTzEDvgAQAftpRD/2SBtTqwjvwZFndG8uTA7xNDR m836SfyX7y3ote1qIciUuFJe+o/AkQmUvUPKn8RqMT/YDDyoWS02WoxyJomSm04zOdmz eeFA== X-Gm-Message-State: AOJu0Yw9kDigDvFTKflrZFVFP3QRPLDOikVpcRTevx0mdZCB+4ZZ8qrr p7VfsXYvQrcDugb5REsyhISFbjigJndYtrFhe5hagToyfD93xXMnyUofl3lQ X-Google-Smtp-Source: AGHT+IG0qbN+2y5RXnTsKHwIROsSCibU7wyPbZArCy3UiULyPpB6coKw4wi9t/gPGCBu7aB26PQiIA== X-Received: by 2002:a05:6512:480c:b0:516:1a1e:5640 with SMTP id eo12-20020a056512480c00b005161a1e5640mr6105820lfb.33.1712063360938; 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 2/5] dnsmasq: add handling of `cache-rr` to init script Date: Tue, 2 Apr 2024 15:09:16 +0200 Message-ID: <20240402130919.58881-2-newtwen+github@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240402130919.58881-1-newtwen+github@gmail.com> References: <20240402130919.58881-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-20240402_060927_118158_04F02F04 X-CRM114-Status: UNSURE ( 7.44 ) 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: dnsmasq v2.90 introduced `--cache-rr=[,...]`. uci config usage: config dnsmasq ... option cache_rr 'AAAA,CNAME,NXDOMAIN,SRV,...' 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:133 listed in] [list.dnswl.org] -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_AU Message has a valid DKIM or DK signature from author's 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_EF Message has a valid DKIM or DK signature from envelope-from 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 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 `--cache-rr=[,...]`. uci config usage: config dnsmasq ... option cache_rr 'AAAA,CNAME,NXDOMAIN,SRV,...' The dnsmasq instance internally builds a linked list of RR to cache from the individually supplied parameters, so it's allowed to provide multiples: ... --cache-rr=AAAA --cache-rr=A ... See https://forum.openwrt.org/t/resolving-query-type-65-to-local-address-for-ios-clients-in-dnsmasq/179504 Tested on: 23.05.2 Signed-off-by: Paul Donald --- package/network/services/dnsmasq/files/dnsmasq.init | 1 + 1 file changed, 1 insertion(+) diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 15cf194673..9bb334f816 100755 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -977,6 +977,7 @@ dnsmasq_start() append_bool "$cfg" filter_aaaa "--filter-AAAA" append_bool "$cfg" filter_a "--filter-A" append_parm "$cfg" filter_rr "--filter-rr" + append_parm "$cfg" cache_rr "--cache-rr" append_parm "$cfg" logfacility "--log-facility" config_get logfacility "$cfg" "logfacility"