diff options
| -rw-r--r-- | package/firewall/Makefile | 2 | ||||
| -rw-r--r-- | package/firewall/files/lib/core_redirect.sh | 10 | ||||
| -rw-r--r-- | package/firewall/files/lib/core_rule.sh | 42 | ||||
| -rw-r--r-- | package/firewall/files/lib/fw.sh | 2 |
4 files changed, 26 insertions, 30 deletions
diff --git a/package/firewall/Makefile b/package/firewall/Makefile index 25c1100405..50b916a581 100644 --- a/package/firewall/Makefile +++ b/package/firewall/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=firewall PKG_VERSION:=2 -PKG_RELEASE:=28 +PKG_RELEASE:=29 include $(INCLUDE_DIR)/package.mk 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 \ } diff --git a/package/firewall/files/lib/core_rule.sh b/package/firewall/files/lib/core_rule.sh index 55381598b5..0a25fcd953 100644 --- a/package/firewall/files/lib/core_rule.sh +++ b/package/firewall/files/lib/core_rule.sh @@ -65,32 +65,28 @@ fw_load_rule() { fw_get_negation src_spec '-s' "${rule_src_ip:+$rule_src_ip/$rule_src_ip_prefixlen}" fw_get_negation dest_spec '-d' "${rule_dest_ip:+$rule_dest_ip/$rule_dest_ip_prefixlen}" - local rule_src_port_copy - local rule_dest_port_copy - [ "$rule_proto" == "tcpudp" ] && rule_proto="tcp udp" - rule_src_port_copy="$rule_src_port" - rule_dest_port_copy="$rule_dest_port" - for rule_proto in $rule_proto; do - rule_src_port="$rule_src_port_copy" - rule_dest_port="$rule_dest_port_copy" - fw_get_negation rule_proto '-p' "$rule_proto" - for rule_src_port in ${rule_src_port:-""}; do - fw_get_port_range rule_src_port $rule_src_port - fw_get_negation rule_src_port '--sport' "$rule_src_port" - for rule_dest_port in ${rule_dest_port:-""}; do - fw_get_port_range rule_dest_port $rule_dest_port - fw_get_negation rule_dest_port '--dport' "$rule_dest_port" - for rule_src_mac in ${rule_src_mac:-""}; do - fw_get_negation rule_src_mac '--mac-source' "$rule_src_mac" - for rule_icmp_type in ${rule_icmp_type:-""}; do - [ "$rule_proto" = "-p icmp" ] || rule_icmp_type="" + local pr; for pr in $rule_proto; do + fw_get_negation pr '-p' "$pr" + local sp; for sp in ${rule_src_port:-""}; do + fw_get_port_range sp $sp + fw_get_negation sp '--sport' "$sp" + local dp; for dp in ${rule_dest_port:-""}; do + fw_get_port_range dp $dp + fw_get_negation dp '--dport' "$dp" + local sm; for sm in ${rule_src_mac:-""}; do + fw_get_negation sm '--mac-source' "$sm" + local it; for it in ${rule_icmp_type:-""}; do + fw_get_negation it '--icmp-type' "$it" + case "$pr" in + *" icmp"|*" icmpv6"|*" 1"|*" 58") sp=""; dp="" ;; + *) it="" ;; + esac fw add $mode $table $chain $target + \ { $rule_src_ip $rule_dest_ip } { \ - $src_spec $dest_spec $rule_proto \ - $rule_src_port $rule_dest_port \ - ${rule_src_mac:+-m mac $rule_src_mac} \ - ${rule_icmp_type:+--icmp-type $rule_icmp_type} \ + $src_spec $dest_spec \ + $pr $sp $dp $it \ + ${sm:+-m mac $sm} \ ${rule_limit:+-m limit --limit $rule_limit \ ${rule_limit_burst:+--limit-burst $rule_limit_burst}} \ $rule_extra \ diff --git a/package/firewall/files/lib/fw.sh b/package/firewall/files/lib/fw.sh index 647bcd6a54..a13eb7eb13 100644 --- a/package/firewall/files/lib/fw.sh +++ b/package/firewall/files/lib/fw.sh @@ -166,7 +166,7 @@ fw__exec() { # <action> <family> <table> <chain> <target> <position> { <rules> } while [ $# -gt 1 ]; do # special parameter handling case "$1:$2" in - -p:icmp*|--protocol:icmp*) + -p:icmp*|-p:1|-p:58|--protocol:icmp*|--protocol:1|--protocol:58) [ "$app" = ip6tables ] && \ cmdline="$cmdline -p icmpv6" || \ cmdline="$cmdline -p icmp" |