- 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
SVN-Revision: 17897
PKG_NAME:=dnsmasq
PKG_VERSION:=2.50
PKG_NAME:=dnsmasq
PKG_VERSION:=2.50
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
dhcp_calc() {
local ip="$1"
dhcp_calc() {
local ip="$1"
append_parm "$cfg" "tftp_root" "--tftp-root"
append_parm "$cfg" "dhcp_boot" "--dhcp-boot"
append_parm "$cfg" "tftp_root" "--tftp-root"
append_parm "$cfg" "dhcp_boot" "--dhcp-boot"
+ config_get DOMAIN "$cfg" domain
+
config_get leasefile $cfg leasefile
[ -e "$leasefile" ] || touch "$leasefile"
config_get_bool cachelocal "$cfg" cachelocal 1
config_get leasefile $cfg leasefile
[ -e "$leasefile" ] || touch "$leasefile"
config_get_bool cachelocal "$cfg" cachelocal 1
local cfg="$1"
config_get name "$cfg" name
local cfg="$1"
config_get name "$cfg" name
- [ -n "$name" ] || return 0
+ [ -n "$name" ] && dhcp_option_add "$cfg" "$name"
config_get mac "$cfg" mac
[ -n "$mac" ] || return 0
config_get mac "$cfg" mac
[ -n "$mac" ] || return 0
config_get ip "$cfg" ip
[ -n "$ip" ] || return 0
config_get ip "$cfg" ip
[ -n "$ip" ] || return 0
- append args "--dhcp-host=$mac,$ip"
-
- dhcp_option_add "$cfg" "$name"
+ append args "--dhcp-host=$mac,$ip${name:+,$name}"
+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() {
include /lib/network
scan_interfaces
start() {
include /lib/network
scan_interfaces
config_foreach dhcp_circuitid_add circuitid
config_foreach dhcp_remoteid_add remoteid
config_foreach dhcp_subscrid_add subscrid
config_foreach dhcp_circuitid_add circuitid
config_foreach dhcp_remoteid_add remoteid
config_foreach dhcp_subscrid_add subscrid
+ config_foreach dhcp_domain_add domain
config_foreach dhcp_add dhcp
/usr/sbin/dnsmasq $args && {
config_foreach dhcp_add dhcp
/usr/sbin/dnsmasq $args && {