extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-18 20:30:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.5.9'

Browse Source
This commit is contained in:
Tom Eastep 2012-11-18 15:02:46 -08:00
commit 57e913d86e
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Shorewall/Macros/macro.NFLOG Normal file
View File

@ -0,0 +1,14 @@
#
# Shorewall version 4 - NFLOG Macro
#
# /usr/share/shorewall/macro.NFLOG
#
# This macro handles the NFLOG Target.
#
###############################################################################
#ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/
# PORT(S) PORT(S) LIMIT GROUP
FORMAT 2
DEFAULT 0
LOG&

5
Shorewall/Perl/Shorewall/Rules.pm
View File

@ -1588,6 +1588,11 @@ sub process_macro ( $$$$$$$$$$$$$$$$$$$) {
$mtarget = substitute_param $param, $mtarget; $mtarget = substitute_param $param, $mtarget;
} }
if ( $mtarget =~ s/&$// ) {
fatal_error "$mtarget& requires a parameter to be supplied in macro invocation" unless $param ne '';
$mtarget = "$mtarget:$macro($param)";
}
my $action = isolate_basic_target $mtarget; my $action = isolate_basic_target $mtarget;
fatal_error "Invalid or missing ACTION ($mtarget)" unless defined $action; fatal_error "Invalid or missing ACTION ($mtarget)" unless defined $action;