mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-27 01:53:27 +01:00
Remove DYNAMIC_ZONES dependency for 'show zones'
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1782 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
a6f07b8bc5
commit
d00fda4e1f
@ -156,3 +156,5 @@ Changes since 2.0.3
|
|||||||
75) Correct bridge handling in "shorewall add" and "shorewall delete"
|
75) Correct bridge handling in "shorewall add" and "shorewall delete"
|
||||||
|
|
||||||
76) Add "shorewall show zones"
|
76) Add "shorewall show zones"
|
||||||
|
|
||||||
|
77) Remove dependency of "show zones" on dynamic zones.
|
||||||
|
@ -6296,8 +6296,9 @@ activate_rules()
|
|||||||
|
|
||||||
[ -n "$complex" ] && frwd_chain=${zone}_frwd
|
[ -n "$complex" ] && frwd_chain=${zone}_frwd
|
||||||
|
|
||||||
|
echo $zone $source_hosts >> ${STATEDIR}/zones
|
||||||
|
|
||||||
if [ -n "$DYNAMIC_ZONES" ]; then
|
if [ -n "$DYNAMIC_ZONES" ]; then
|
||||||
echo $zone $source_hosts >> ${STATEDIR}/zones
|
|
||||||
echo "$FW $zone $chain1" >> ${STATEDIR}/chains
|
echo "$FW $zone $chain1" >> ${STATEDIR}/chains
|
||||||
echo "$zone $FW $chain2" >> ${STATEDIR}/chains
|
echo "$zone $FW $chain2" >> ${STATEDIR}/chains
|
||||||
fi
|
fi
|
||||||
|
@ -238,8 +238,7 @@ show)
|
|||||||
shorewall show tc - displays information about the traffic
|
shorewall show tc - displays information about the traffic
|
||||||
control/shaping configuration.
|
control/shaping configuration.
|
||||||
|
|
||||||
shorewall show zones - displays the contents of all zones. Requires
|
shorewall show zones - displays the contents of all zones.
|
||||||
DYNAMIC_ZONES=Yes in /etc/shorewall/shorewall.conf
|
|
||||||
|
|
||||||
When -x is given, that option is also passed to iptables to display actual packet and byte counts."
|
When -x is given, that option is also passed to iptables to display actual packet and byte counts."
|
||||||
;;
|
;;
|
||||||
|
@ -713,9 +713,9 @@ New Features:
|
|||||||
Shorewall. If not specified, the iptables executable determined by
|
Shorewall. If not specified, the iptables executable determined by
|
||||||
the PATH setting is used.
|
the PATH setting is used.
|
||||||
|
|
||||||
31) When DYNAMIC_ZONES=Yes in /etc/shorewall/shorewall.conf, you can
|
31) You can now use the "shorewall show zones" command to display the
|
||||||
now use the "shorewall show zones" command to display the current
|
current contents of the zones. This is particularly useful if you
|
||||||
contents of the zones.
|
use dynamic zones (DYNAMIC_ZONES=Yes in shorewall.conf).
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
|
@ -927,7 +927,7 @@ case "$1" in
|
|||||||
done < $STATEDIR/zones
|
done < $STATEDIR/zones
|
||||||
echo
|
echo
|
||||||
else
|
else
|
||||||
echo " ERROR: Dynamic zones are not enabled" >&2
|
echo " ERROR: $STATEDIR/zones does not exist" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
Loading…
Reference in New Issue
Block a user