From 7ca53ce6b87db6dd11df8bf7e8d033aacfd8077c Mon Sep 17 00:00:00 2001 From: teastep Date: Wed, 31 Aug 2005 17:03:37 +0000 Subject: [PATCH] More cleanup of Macros git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2607 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall/macro.template | 13 ++++++++++++- Shorewall/releasenotes.txt | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Shorewall/macro.template b/Shorewall/macro.template index d9d81e9e6..a984ddec2 100644 --- a/Shorewall/macro.template +++ b/Shorewall/macro.template @@ -23,7 +23,7 @@ # Columns are: # # ACTION ACCEPT, DROP, REJECT, DNAT, DNAT-, REDIRECT, CONTINUE, -# LOG, or QUEUE. +# LOG, QUEUE, PARAM or an name. # # ACCEPT -- allow the connection request # ACCEPT+ -- like ACCEPT but also excludes the @@ -74,6 +74,17 @@ # QUEUE -- Queue the packet to a user-space # application such as ftwall # (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. +# -- The name of an action defined in +# /usr/share/shorewall/actions.std or +# in /etc/shorewall/actions. # # The ACTION may optionally be followed # by ":" and a syslog log level (e.g, REJECT:info or diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index ebd2c98c7..3356978aa 100755 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -294,14 +294,14 @@ New Features in Shorewall 2.5.* macro are substituted in the corresponding column in each rule in 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 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. - 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. SOURCE and