diff options
author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-05-06 10:01:45 +0000 |
---|---|---|
committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-05-06 10:01:45 +0000 |
commit | 4d52d8b65322e77be1021c41f42639f557869753 (patch) | |
tree | 2c238c90f5175c8d7d5b7b139129046d84238db0 /package/network/services/ipset-dns/files | |
parent | bd4ec4d567494ce433865557e7896a2072f16707 (diff) |
ipset-dns: support simultaneously populating IPv4 and IPv6 sets
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36554 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services/ipset-dns/files')
-rw-r--r-- | package/network/services/ipset-dns/files/ipset-dns.config | 7 | ||||
-rwxr-xr-x | package/network/services/ipset-dns/files/ipset-dns.init | 7 |
2 files changed, 9 insertions, 5 deletions
diff --git a/package/network/services/ipset-dns/files/ipset-dns.config b/package/network/services/ipset-dns/files/ipset-dns.config index 52e87b27cc..0270366af7 100644 --- a/package/network/services/ipset-dns/files/ipset-dns.config +++ b/package/network/services/ipset-dns/files/ipset-dns.config @@ -1,7 +1,10 @@ # declare an ipset-dns listener instance, multiple allowed config ipset-dns - # use given ipset - option ipset 'domain-filter' + # use given ipset for type A (IPv4) responses + option ipset 'domain-filter-ipv4' + + # use given ipset for type AAAA (IPv6) responses + option ipset6 'domain-filter-ipv6' # use given listening port # defaults to 53000 + instance number diff --git a/package/network/services/ipset-dns/files/ipset-dns.init b/package/network/services/ipset-dns/files/ipset-dns.init index 5d41539a7b..7b732791ea 100755 --- a/package/network/services/ipset-dns/files/ipset-dns.init +++ b/package/network/services/ipset-dns/files/ipset-dns.init @@ -21,10 +21,11 @@ find_nameserver() { start_instance() { local cfg="$1" - local ipset port dns + local ipset ipset6 port dns config_get ipset "$cfg" ipset - [ -n "$ipset" ] || { + config_get ipset6 "$cfg" ipset6 + [ -n "$ipset$ipset6" ] || { echo "No ipset specified for instance $cfg" >&2 return 1 } @@ -38,7 +39,7 @@ start_instance() { config_get port "$cfg" port $((PORT++)) SERVICE_PID_FILE="/var/run/ipset-dns-$port.pid" \ - service_start /usr/sbin/ipset-dns "$ipset" "$port" "$dns" + service_start /usr/sbin/ipset-dns "$ipset" "$ipset6" "$port" "$dns" } start() { |