extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-25 07:38:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Report the file/line where action invoked

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2017-03-05 09:29:00 -08:00
parent 63ec936f21
commit c1e7fce1c5
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Shorewall/Perl/Shorewall/Config.pm
View File

@ -2999,8 +2999,8 @@ sub process_compiler_directive( $$$$ ) {
$filename , $filename ,
$linenumber , $linenumber ,
1 ) , 1 ) ,
$filename , $actparams{callfile} ,
$linenumber ) unless $omitting; $actparams{callline} ) unless $omitting;
} , } ,
WARNING => sub() { WARNING => sub() {
@ -3009,8 +3009,8 @@ sub process_compiler_directive( $$$$ ) {
$filename , $filename ,
$linenumber , $linenumber ,
1 ), 1 ),
$filename , $actparams{callfile} ,
$linenumber ) unless $omitting; $actparams{callline} ) unless $omitting;
} , } ,
INFO => sub() { INFO => sub() {
@ -3019,8 +3019,8 @@ sub process_compiler_directive( $$$$ ) {
$filename , $filename ,
$linenumber , $linenumber ,
1 ), 1 ),
$filename , $actparams{callfile} ,
$linenumber ) unless $omitting; $actparams{callline} ) unless $omitting;
} , } ,
'WARNING!' => sub() { 'WARNING!' => sub() {
@ -3029,8 +3029,8 @@ sub process_compiler_directive( $$$$ ) {
$filename , $filename ,
$linenumber , $linenumber ,
1 ), 1 ),
$filename , $actparams{callfile} ,
$linenumber ) unless $omitting; $actparams{callline} ) unless $omitting;
} , } ,
'INFO!' => sub() { 'INFO!' => sub() {
@ -3039,8 +3039,8 @@ sub process_compiler_directive( $$$$ ) {
$filename , $filename ,
$linenumber , $linenumber ,
1 ), 1 ),
$filename , $actparams{callfile} ,
$linenumber ) unless $omitting; $actparams{callline} ) unless $omitting;
} , } ,
REQUIRE => sub() { REQUIRE => sub() {
@ -3548,6 +3548,8 @@ sub push_action_params( $$$$$$ ) {
$actparams{logtag} = $logtag; $actparams{logtag} = $logtag;
$actparams{caller} = $caller; $actparams{caller} = $caller;
$actparams{disposition} = '' if $chainref->{action}; $actparams{disposition} = '' if $chainref->{action};
$actparams{callfile} = $currentfilename;
$actparams{callline} = $currentlinenumber;
# #
# The Shorewall variable '@chain' has non-word characters other than hyphen removed # The Shorewall variable '@chain' has non-word characters other than hyphen removed
# #