KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dnsmasq: fix dhcp "ignore" option on wwan interfaces

Browse source 
Init script won't append --no-dhcp-interface option if interface
protocol is one of: ncm, directip, qmi, mbim.
This is caused by IP address assigned to dynamically created netifd
interfaces. As a result there's no netmask assigned to the main
interface and dhcp_add() function returns prematurely.

By moving network subnet check we can ensure that --no-dhcp-interface is
properly generated for wwan interfaces.

Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com> [PKG_RELEASE increase; move network checks]
This commit is contained in:
Marcin Jurkowski 2017-09-14 14:49:10 +02:00 committed by Hans Dedecker
parent 400c5f03c3
commit feab5fa51e
2 changed files with 4 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.77 PKG_VERSION:=2.77
PKG_RELEASE:=12 PKG_RELEASE:=13
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/

5
package/network/services/dnsmasq/files/dnsmasq.init
View file

@ -457,9 +457,7 @@ dhcp_add() {
config_get networkid "$cfg" networkid config_get networkid "$cfg" networkid
[ -n "$networkid" ] || networkid="$net" [ -n "$networkid" ] || networkid="$net"
network_get_subnet subnet "$net" || return 0
network_get_device ifname "$net" || return 0 network_get_device ifname "$net" || return 0
network_get_protocol proto "$net" || return 0
[ "$cachelocal" = "0" ] && network_get_dnsserver dnsserver "$net" && { [ "$cachelocal" = "0" ] && network_get_dnsserver dnsserver "$net" && {
DNS_SERVERS="$DNS_SERVERS $dnsserver" DNS_SERVERS="$DNS_SERVERS $dnsserver"
@ -471,6 +469,9 @@ dhcp_add() {
return 0 return 0
} }
network_get_subnet subnet "$net" || return 0
network_get_protocol proto "$net" || return 0
# Do not support non-static interfaces for now # Do not support non-static interfaces for now
[ static = "$proto" ] || return 0 [ static = "$proto" ] || return 0