extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-24 00:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve progress messages written to generated script

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3246 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-01-07 17:14:07 +00:00
parent b17bc9f62e
commit 20489c736b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Shorewall/firewall
View File

@ -117,6 +117,11 @@ save_progress_message()
echo >> $RESTOREBASE echo >> $RESTOREBASE
} }
save_progress_message_short()
{
echo "progress_message \"$@\"" >> $RESTOREBASE
}
# #
# Save the passed command in the restore script then run it -- returns the status of the command # Save the passed command in the restore script then run it -- returns the status of the command
# If the command involves file redirection then it must be enclosed in quotes as in: # If the command involves file redirection then it must be enclosed in quotes as in:
@ -4645,6 +4650,7 @@ process_action() # $1 = chain (Chain to add the rules to)
;; ;;
generate) generate)
progress_message " Rule \"$rule\" compiled." progress_message " Rule \"$rule\" compiled."
save_progress_message_short " Rule \"$rule\" added."
;; ;;
*) *)
progress_message " Rule \"$rule\" added." progress_message " Rule \"$rule\" added."
@ -5263,6 +5269,8 @@ process_actions3() {
echo "Processing $(find_file $f) for Chain $xchain..." echo "Processing $(find_file $f) for Chain $xchain..."
[ $COMMAND = generate ] && save_progress_message "Creating action Chain $xchain..."
while read xtarget xclients xservers xprotocol xports xcports xratelimit xuserspec; do while read xtarget xclients xservers xprotocol xports xcports xratelimit xuserspec; do
expandv xtarget expandv xtarget
# #
@ -6308,7 +6316,7 @@ process_rule() # $1 = target
;; ;;
generate) generate)
progress_message " Rule \"$rule\" compiled." progress_message " Rule \"$rule\" compiled."
save_command "progress_message ' Rule \"'$rule'\" added.'" save_progress_message_short " Rule \"$rule\" added."
;; ;;
*) *)
progress_message " Rule \"$rule\" added." progress_message " Rule \"$rule\" added."
@ -8978,7 +8986,6 @@ generate_firewall() # $1 = File Name
masq=$(find_file masq) masq=$(find_file masq)
if [ -f $masq ]; then if [ -f $masq ]; then
save_progress_message "Restoring Masquerading/SNAT..."
setup_masq $masq setup_masq $masq
fi fi