extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-25 15:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renamed dynamic ipsec zone chain to avoid collision with dynamic forward chain

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1818 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2004-12-09 04:04:29 +00:00
parent a431c86df0
commit 573f97f682
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Shorewall2/firewall
View File

@ -6280,8 +6280,8 @@ activate_rules()
if [ -n "$is_ipsec" ]; then if [ -n "$is_ipsec" ]; then
eval source_hosts=\$${zone}_hosts eval source_hosts=\$${zone}_hosts
if [ -n "$DYNAMIC_ZONES" ]; then if [ -n "$DYNAMIC_ZONES" ]; then
createchain ${zone}_dynf No createchain ${zone}_dyn No
run_iptables -A $frwd_chain -j ${zone}_dynf run_iptables -A $frwd_chain -j ${zone}_dyn
fi fi
else else
eval source_hosts=\$${zone}_ipsec_hosts eval source_hosts=\$${zone}_ipsec_hosts
@ -6810,7 +6810,7 @@ add_to_zone() # $1...${n-1} = <interface>[:<hosts>] $n = zone
if [ "$iface" != "$interface" -o "$hosts" != "$host" ]; then if [ "$iface" != "$interface" -o "$hosts" != "$host" ]; then
if is_ipsec_host $z1 $h; then if is_ipsec_host $z1 $h; then
do_iptables -A ${z1}_dynf -o $interface $(match_dest_hosts $host) $(match_ipsec_out $z2 $newhost) -j $chain do_iptables -A ${z1}_dyn -o $interface $(match_dest_hosts $host) $(match_ipsec_out $z2 $newhost) -j $chain
else else
do_iptables -A $(dynamic_fwd $iface) $(match_source_hosts $hosts) -o $interface $(match_dest_hosts $host) $(match_ipsec_out $z2 $newhost) -j $chain do_iptables -A $(dynamic_fwd $iface) $(match_source_hosts $hosts) -o $interface $(match_dest_hosts $host) $(match_ipsec_out $z2 $newhost) -j $chain
fi fi
@ -6985,7 +6985,7 @@ delete_from_zone() # $1 = <interface>[:<hosts>] $2 = zone
if [ "$iface" != "$interface" -o "$hosts" != "$host" ]; then if [ "$iface" != "$interface" -o "$hosts" != "$host" ]; then
if is_ipsec_host $z1 $h; then if is_ipsec_host $z1 $h; then
qt_iptables -D ${z1}_dynf -o $interface $(match_dest_hosts $host) $(match_ipsec_out $z2 $delhost) -j $chain qt_iptables -D ${z1}_dyn -o $interface $(match_dest_hosts $host) $(match_ipsec_out $z2 $delhost) -j $chain
else else
qt_iptables -D $(dynamic_fwd $iface) $(match_source_hosts $hosts) -o $interface $(match_dest_hosts $host) $(match_ipsec_out $z2 $delhost) -j $chain qt_iptables -D $(dynamic_fwd $iface) $(match_source_hosts $hosts) -o $interface $(match_dest_hosts $host) $(match_ipsec_out $z2 $delhost) -j $chain
fi fi