diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-05-19 21:35:23 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-05-19 21:35:23 +0000 |
| commit | e903e01368e14da91b7fca79198449b97528cd61 (patch) | |
| tree | 3737e742d161802a733eab5124b42e1925b77d22 /package/firewall/files/lib/core_forwarding.sh | |
| parent | 2cce948705ac4c2e2ce007bc351fda4bf36506dc (diff) | |
| download | upstream-e903e01368e14da91b7fca79198449b97528cd61.tar.gz upstream-e903e01368e14da91b7fca79198449b97528cd61.tar.bz2 upstream-e903e01368e14da91b7fca79198449b97528cd61.zip | |
[package] firewall:
- fix ip6tables rules when icmp_type option is set
- add "family" option to zones, forwardings, redirects and rules to selectively apply rules to iptables and/or ip6tables
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21508 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/firewall/files/lib/core_forwarding.sh')
| -rw-r--r-- | package/firewall/files/lib/core_forwarding.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/package/firewall/files/lib/core_forwarding.sh b/package/firewall/files/lib/core_forwarding.sh index 766e48e38e..689e2628c2 100644 --- a/package/firewall/files/lib/core_forwarding.sh +++ b/package/firewall/files/lib/core_forwarding.sh @@ -7,6 +7,7 @@ fw_config_get_forwarding() { string name "" \ string src "" \ string dest "" \ + string family "" \ } || return [ -n "$forwarding_name" ] || forwarding_name=$forwarding__name } @@ -26,7 +27,9 @@ fw_load_forwarding() { target=zone_${forwarding_dest}_ACCEPT } - fw add i f $chain $target ^ + local mode=$(fw_get_family_mode ${forwarding_family:-x} ${forwarding_dest:-${forwarding_src:--}} i) + + fw add $mode f $chain $target ^ # propagate masq zone flag [ -n "$forwarding_src" ] && list_contains CONNTRACK_ZONES $forwarding_src && { |