diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-05-16 13:37:49 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-05-16 13:37:49 +0000 |
| commit | 329d18a25c11aead0bbc09546715b9af6fed5ead (patch) | |
| tree | 12cc7f9c3a9c87f6e1bc11dfdd0ad1d86c847749 /package/firewall | |
| parent | 82fc13d3c2c9456607ac83885615c07a2c994240 (diff) | |
| download | upstream-329d18a25c11aead0bbc09546715b9af6fed5ead.tar.gz upstream-329d18a25c11aead0bbc09546715b9af6fed5ead.tar.bz2 upstream-329d18a25c11aead0bbc09546715b9af6fed5ead.zip | |
firewall: rework interface address determination to skip ipv6 addresses
SVN-Revision: 31755
Diffstat (limited to 'package/firewall')
| -rw-r--r-- | package/firewall/files/reflection.hotplug | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/package/firewall/files/reflection.hotplug b/package/firewall/files/reflection.hotplug index 73d9c61df8..62f5097291 100644 --- a/package/firewall/files/reflection.hotplug +++ b/package/firewall/files/reflection.hotplug @@ -9,24 +9,34 @@ find_iface_address() local ipaddr="$2" local prefix="$3" + local idx=1 local tmp="$(ubus call network.interface."$iface" status 2>/dev/null)" json_load "${tmp:-{}}" json_get_type tmp address if [ "$tmp" = array ]; then - json_select address - json_get_type tmp 1 - - if [ "$tmp" = object ]; then - json_select 1 - [ -n "$ipaddr" ] && json_get_var "$ipaddr" address - [ -n "$prefix" ] && json_get_var "$prefix" mask - - fi + while true; do + json_get_type tmp $idx + [ "$tmp" = object ] || break + + json_select $((idx++)) + json_get_var tmp address + + case "$tmp" in + *:*) json_select .. ;; + *) + [ -n "$ipaddr" ] && json_get_var $ipaddr address + [ -n "$prefix" ] && json_get_var $prefix mask + return 0 + ;; + esac + done fi + + return 1 } if [ "$ACTION" = "add" ] && [ "$INTERFACE" = "wan" ]; then |