[source] dnsmasq: add interface-name uci list.

LEDE Commits lede-commits at lists.infradead.org
Tue May 9 01:01:34 PDT 2017


dedeckeh pushed a commit to source.git, branch master:
https://git.lede-project.org/eb99f8912ad7c827c876b1a64e9f347c2cbaf7af

commit eb99f8912ad7c827c876b1a64e9f347c2cbaf7af
Author: Daniel Danzberger <daniel at dd-wrt.com>
AuthorDate: Tue May 2 17:05:07 2017 +0200

    dnsmasq: add interface-name uci list.
    
    This patch adds the interface-name option for each dhcp config
    in /etc/config/dhcp.
    
    With the interface_name option users can define a DNS name for each dhcp section
    that will be resolved by dnsmasq with the underlaying interface address.
    
    For example:
    config dhcp 'lan'
    	option interface 'lan'
    	...
    	list interface_name 'home.lan'
    	...
    
    Signed-off-by: Daniel Danzberger <daniel at dd-wrt.com>
    Signed-off-by: Hans Dedecker <dedeckeh at gmail.com> [PKG_RELEASE increase]
---
 package/network/services/dnsmasq/Makefile           | 2 +-
 package/network/services/dnsmasq/files/dnsmasq.init | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
index e8d8e85..113a6f1 100644
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
 PKG_VERSION:=2.77test5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/test-releases
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 3b80130..c742205 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -142,6 +142,10 @@ append_pxe_service() {
 	xappend "--pxe-service=$1"
 }
 
+append_interface_name() {
+	xappend "--interface-name=$1,$2"
+}
+
 filter_dnsmasq() {
 	local cfg="$1" func="$2" match_cfg="$3" found_cfg
 
@@ -467,6 +471,8 @@ dhcp_add() {
 	config_get ra_management "$cfg" ra_management
 	config_get ra_preference "$cfg" ra_preference
 
+	config_list_foreach "$cfg" "interface_name" append_interface_name "$ifname"
+
 	# Put the router host name on this DHCP served interface address(es)
 	dhcp_this_host_add "$net" "$ifname" "$ADD_LOCAL_FQDN"
 



More information about the lede-commits mailing list