More cleanup of Macros

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2607 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2005-08-31 17:03:37 +00:00
parent 738b45ad9e
commit 7ca53ce6b8
2 changed files with 14 additions and 3 deletions

View File

@ -23,7 +23,7 @@
# Columns are: # Columns are:
# #
# ACTION ACCEPT, DROP, REJECT, DNAT, DNAT-, REDIRECT, CONTINUE, # ACTION ACCEPT, DROP, REJECT, DNAT, DNAT-, REDIRECT, CONTINUE,
# LOG, or QUEUE. # LOG, QUEUE, PARAM or an <action> name.
# #
# ACCEPT -- allow the connection request # ACCEPT -- allow the connection request
# ACCEPT+ -- like ACCEPT but also excludes the # ACCEPT+ -- like ACCEPT but also excludes the
@ -74,6 +74,17 @@
# QUEUE -- Queue the packet to a user-space # QUEUE -- Queue the packet to a user-space
# application such as ftwall # application such as ftwall
# (http://p2pwall.sf.net). # (http://p2pwall.sf.net).
# PARAM -- If you code PARAM as the action in
# a macro then when you invoke the
# macro, you can include the name of
# the macro followed by a slash ("/")
# and an ACTION (either builtin or
# user-defined. All instances of
# PARAM in the body of the macro will
# be replaced with the ACTION.
# <action> -- The name of an action defined in
# /usr/share/shorewall/actions.std or
# in /etc/shorewall/actions.
# #
# The ACTION may optionally be followed # The ACTION may optionally be followed
# by ":" and a syslog log level (e.g, REJECT:info or # by ":" and a syslog log level (e.g, REJECT:info or

View File

@ -294,14 +294,14 @@ New Features in Shorewall 2.5.*
macro are substituted in the corresponding column in each rule in macro are substituted in the corresponding column in each rule in
the macro. The first three columns get special treatment: the macro. The first three columns get special treatment:
TARGET If you code PARAM as the target in a macro then ACTION If you code PARAM as the action in a macro then
when you invoke the macro, you can include the when you invoke the macro, you can include the
name of the macro followed by a slash ("/") and name of the macro followed by a slash ("/") and
an ACTION (either builtin or user-defined. All an ACTION (either builtin or user-defined. All
instances of PARAM in the body of the macro will be instances of PARAM in the body of the macro will be
replaced with the ACTION. replaced with the ACTION.
Any logging applied when the action is invoked is Any logging applied when the macro is invoked is
applied following the same rules as for actions. applied following the same rules as for actions.
SOURCE and SOURCE and