holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Pass arguments to user exits

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4399 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-08-22 16:43:24 +00:00
parent 426641a572
commit 6ab40df245
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Shorewall/compiler
View File

@ -2201,14 +2201,16 @@ process_action() # $1 = chain (Chain to add the rules to)
# #
# Source the extension script for an action, if any # Source the extension script for an action, if any
# #
process_action_file() # $1 = File Name process_action_file() # $1 = File Name, $2 - n = Arguments
{ {
local user_exit=$(find_file $1) local user_exit=$(find_file $1)
shift
if [ -f $user_exit ]; then if [ -f $user_exit ]; then
progress_message "Processing $user_exit ..." progress_message "Processing $user_exit ..."
. $user_exit . $user_exit $@
fi fi
} }
@ -2265,7 +2267,7 @@ createlogactionchain() # $1 = Action Name, $2 = Log Level [: Log Tag ]
[ none = "${LEVEL%\!}" ] && LEVEL= [ none = "${LEVEL%\!}" ] && LEVEL=
process_action_file $1 process_action_file $1 "$CHAIN" "$LEVEL" "$TAG"
eval ${action}_chains=\"\$${action}_chains $level $CHAIN\" eval ${action}_chains=\"\$${action}_chains $level $CHAIN\"
@ -2508,7 +2510,7 @@ process_actions1() {
verify_macro_from_action verify_macro_from_action
else else
rule="$xtarget $xclients $xservers $xprotocol $xports $xcports $xratelimit $xuserspec" rule="$xtarget $xclients $xservers $xprotocol $xports $xcports $xratelimit $xuserspec"
fatal_error "Invalid TARGET in rule \"$rule\"" fatal_error "Invalid TARGET in rule \"$rule\" (do you need the clib.macros Shorewall Library?)"
fi fi
fi fi
;; ;;
@ -6726,14 +6728,18 @@ do_initialize() {
FUNCTIONS=${SHAREDIR}/functions FUNCTIONS=${SHAREDIR}/functions
[ -n "${VERBOSE:=2}" ] [ -n "${VERBOSE:=2}" ]
#
# Load Libraries shared with run-time
#
if [ -f $FUNCTIONS ]; then if [ -f $FUNCTIONS ]; then
[ $VERBOSE -ge 2 ] && echo "Loading $FUNCTIONS..." [ $VERBOSE -ge 2 ] && echo "Loading $FUNCTIONS..."
. $FUNCTIONS . $FUNCTIONS
else else
fatal_error "$FUNCTIONS does not exist!" fatal_error "$FUNCTIONS does not exist!"
fi fi
#
# Load compiler libraries
#
for clib in ${SHAREDIR}/clib.*; do for clib in ${SHAREDIR}/clib.*; do
case $clib in case $clib in
${SHAREDIR}/clib.\*) ${SHAREDIR}/clib.\*)