mirror/openwrt
1
0
Fork 0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2024-10-18 21:48:23 +02:00
Code Issues

dnsmasq: Don't add local hostname if ula prefix is not specified

Browse Source 
Commit 6a7e56b adds support for adding local hostname for own lan ula adress
but if ula prefix is not specified results into an invalid config (address=/OpenWrt.lan/1)
causing dnsmasq not to start up.
Use lanaddr6 when adding local hostname as the lan ula address is constructed based on the
UCI parameters ip6hint and ip6ifaceid and thus not always ula prefix suffixed with 1

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>

SVN-Revision: 48495
This commit is contained in:
Jo-Philipp Wich 2016-01-25 17:47:22 +00:00
parent 565570cfd5
commit d8da5c5630
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/services/dnsmasq/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq PKG_NAME:=dnsmasq
PKG_VERSION:=2.75 PKG_VERSION:=2.75
PKG_RELEASE:=4 PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq

4
package/network/services/dnsmasq/files/dnsmasq.init
View File

@ -609,11 +609,11 @@ start_service() {
dhcp_domain_add "" "$hostname" "$lanaddr" dhcp_domain_add "" "$hostname" "$lanaddr"
} }
network_get_ipaddrs6 lanaddr6 "lan" && { [ -n "$ulaprefix" ] && network_get_ipaddrs6 lanaddr6 "lan" && {
for lanaddr6 in $lanaddr6; do for lanaddr6 in $lanaddr6; do
case "$lanaddr6" in case "$lanaddr6" in
"${ulaprefix%%:/*}"*) "${ulaprefix%%:/*}"*)
dhcp_domain_add "" "$hostname" "${ulaprefix%%/*}1" dhcp_domain_add "" "$hostname" "$lanaddr6"
;; ;;
esac esac
done done