diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-07-06 22:10:46 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-07-06 22:10:46 +0000 |
| commit | dd4934a943d4de4fd4a85620889276bc0c8bdcc5 (patch) | |
| tree | 955f4b7e063e835b43d38e694232e28cd423d18e /package/firewall/files/lib/core_redirect.sh | |
| parent | 302347e4d45ef075007817e1c53732b0a348ac9b (diff) | |
| download | master-31e0f0ae-dd4934a943d4de4fd4a85620889276bc0c8bdcc5.tar.gz master-31e0f0ae-dd4934a943d4de4fd4a85620889276bc0c8bdcc5.tar.bz2 master-31e0f0ae-dd4934a943d4de4fd4a85620889276bc0c8bdcc5.zip | |
firewall: - solve scoping issues when multiple values are used, thanks Daniel Dickinson - ignore src_port/dest_port for proto icmp rules, ignore icmp_type for non-icmp rules - properly handle icmp when proto is given in numerical form (1, 58) - support negated icmp types
SVN-Revision: 27500
Diffstat (limited to 'package/firewall/files/lib/core_redirect.sh')
| -rw-r--r-- | package/firewall/files/lib/core_redirect.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/firewall/files/lib/core_redirect.sh b/package/firewall/files/lib/core_redirect.sh index 0b8030d96a..a6245fad24 100644 --- a/package/firewall/files/lib/core_redirect.sh +++ b/package/firewall/files/lib/core_redirect.sh @@ -91,15 +91,15 @@ fw_load_redirect() { fw_get_negation destports '--dport' "$destports" [ "$redirect_proto" == "tcpudp" ] && redirect_proto="tcp udp" - for redirect_proto in $redirect_proto; do - fw_get_negation redirect_proto '-p' "$redirect_proto" - for redirect_src_mac in ${redirect_src_mac:-""}; do - fw_get_negation redirect_src_mac '--mac-source' "$redirect_src_mac" + local pr; for pr in $redirect_proto; do + fw_get_negation pr '-p' "$pr" + local sm; for sm in ${redirect_src_mac:-""}; do + fw_get_negation sm '--mac-source' "$sm" fw add $mode n $natchain $redirect_target + \ { $redirect_src_ip $redirect_dest_ip } { \ $srcaddr $srcdaddr $redirect_proto \ $srcports $srcdports \ - ${redirect_src_mac:+-m mac $redirect_src_mac} \ + ${sm:+-m mac $sm} \ $natopt $nataddr${natports:+:$natports} \ $redirect_options \ } |