From 606e8cf444864687c34602f480ff0042632d1578 Mon Sep 17 00:00:00 2001 From: Carsten Schuette Date: Wed, 17 Jul 2024 20:09:46 +0200 Subject: [PATCH] dnsmasq: Add EDNS0 Upstream support Signed-off-by: Carsten Schuette --- package/network/services/dnsmasq/Makefile | 2 +- .../network/services/dnsmasq/files/dnsmasq.init | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index 5224e996a49a06..0a597c03ce405b 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq PKG_UPSTREAM_VERSION:=2.90 PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION))) -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz PKG_SOURCE_URL:=https://thekelleys.org.uk/dnsmasq/ diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 138a913f87f3d9..3a43433232828a 100755 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -973,6 +973,21 @@ dnsmasq_start() append_bool "$cfg" rapidcommit "--dhcp-rapid-commit" append_bool "$cfg" scriptarp "--script-arp" + config_get add_mac "$cfg" add_mac + if [ "$add_mac" = "enabled" ] || [ "$add_mac" = "1" ]; then + xappend "--add-mac" + elif [ -n "$add_mac" ]; then + xappend "--add-mac=$add_mac" + fi + append_bool "$cfg" strip_mac "--strip-mac" + config_get add_subnet "$cfg" add_subnet + if [ "$add_subnet" = "enabled" ] || [ "$add_subnet" = "1" ]; then + xappend "--add-subnet" + elif [ -n "$add_subnet" ]; then + xappend "--add-subnet=$add_subnet" + fi + append_bool "$cfg" strip_subnet "--strip-subnet" + append_bool "$cfg" filter_aaaa "--filter-AAAA" append_bool "$cfg" filter_a "--filter-A"