diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2013-05-06 10:01:45 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2013-05-06 10:01:45 +0000 |
| commit | 95e139d0b269f86e575b36ebca4ac7d810398246 (patch) | |
| tree | 91f77fa139e9287eb9afb045cd1cca1f63f141ff /package/network/services/ipset-dns/files | |
| parent | 026271d03c28b3b88e64afe04bd3d236971cfaf2 (diff) | |
| download | master-31e0f0ae-95e139d0b269f86e575b36ebca4ac7d810398246.tar.gz master-31e0f0ae-95e139d0b269f86e575b36ebca4ac7d810398246.tar.bz2 master-31e0f0ae-95e139d0b269f86e575b36ebca4ac7d810398246.zip | |
ipset-dns: support simultaneously populating IPv4 and IPv6 sets
SVN-Revision: 36554
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() { |