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

dnsmasq: - make "name" option in "host" sections optional and append it to -G if set, allows specifying hostnames for static leases without resorting to /etc/hosts - implement "domain" sections, allows defining arbitary host names and associated ptr records from uci - bump package revision

Browse source 
SVN-Revision: 17897
This commit is contained in:
Jo-Philipp Wich 2009-10-05 16:58:06 +00:00
parent 848a064c2c
commit 0582d1ffb7
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/dnsmasq/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq PKG_NAME:=dnsmasq
PKG_VERSION:=2.50 PKG_VERSION:=2.50
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq

24
package/dnsmasq/files/dnsmasq.init
View file

@ -3,6 +3,7 @@
START=60 START=60
DNS_SERVERS="" DNS_SERVERS=""
DOMAIN=""
dhcp_calc() { dhcp_calc() {
local ip="$1" local ip="$1"
@ -83,6 +84,8 @@ dnsmasq() {
append_parm "$cfg" "tftp_root" "--tftp-root" append_parm "$cfg" "tftp_root" "--tftp-root"
append_parm "$cfg" "dhcp_boot" "--dhcp-boot" append_parm "$cfg" "dhcp_boot" "--dhcp-boot"
config_get DOMAIN "$cfg" domain
config_get leasefile $cfg leasefile config_get leasefile $cfg leasefile
[ -e "$leasefile" ] || touch "$leasefile" [ -e "$leasefile" ] || touch "$leasefile"
config_get_bool cachelocal "$cfg" cachelocal 1 config_get_bool cachelocal "$cfg" cachelocal 1
@ -165,7 +168,7 @@ dhcp_host_add() {
local cfg="$1" local cfg="$1"
config_get name "$cfg" name config_get name "$cfg" name
[ -n "$name" ] || return 0 [ -n "$name" ] && dhcp_option_add "$cfg" "$name"
config_get mac "$cfg" mac config_get mac "$cfg" mac
[ -n "$mac" ] || return 0 [ -n "$mac" ] || return 0
@ -173,9 +176,7 @@ dhcp_host_add() {
config_get ip "$cfg" ip config_get ip "$cfg" ip
[ -n "$ip" ] || return 0 [ -n "$ip" ] || return 0
append args "--dhcp-host=$mac,$ip" append args "--dhcp-host=$mac,$ip${name:+,$name}"
dhcp_option_add "$cfg" "$name"
} }
dhcp_mac_add() { dhcp_mac_add() {
@ -270,6 +271,20 @@ dhcp_option_add() {
} }
dhcp_domain_add() {
local cfg="$1"
config_get name "$cfg" name
[ -n "$name" ] || return 0
config_get ip "$cfg" ip
[ -n "$ip" ] || return 0
local oIFS="$IFS"; IFS="."; set -- $ip; IFS="$oIFS"
append args "-A /$name${DOMAIN:+.$DOMAIN}/$ip"
append args "--ptr-record=$4.$3.$2.$1.in-addr.arpa,$name${DOMAIN:+.$DOMAIN}"
}
start() { start() {
include /lib/network include /lib/network
scan_interfaces scan_interfaces
@ -285,6 +300,7 @@ start() {
config_foreach dhcp_circuitid_add circuitid config_foreach dhcp_circuitid_add circuitid
config_foreach dhcp_remoteid_add remoteid config_foreach dhcp_remoteid_add remoteid
config_foreach dhcp_subscrid_add subscrid config_foreach dhcp_subscrid_add subscrid
config_foreach dhcp_domain_add domain
config_foreach dhcp_add dhcp config_foreach dhcp_add dhcp
/usr/sbin/dnsmasq $args && { /usr/sbin/dnsmasq $args && {