extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-22 18:51:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Issue warning when ULOG is used.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2018-12-14 08:56:46 -08:00
parent be2110b47e
commit 6908a4bcf7
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -677,6 +677,7 @@ our $comments_allowed; # True if [?]COMMENT is allowed in the current file
our $nocomment; # When true, ignore [?]COMMENT in the current file our $nocomment; # When true, ignore [?]COMMENT in the current file
our $sr_comment; # When true, $comment should only be applied to the current rule our $sr_comment; # When true, $comment should only be applied to the current rule
our $warningcount; # Used to suppress duplicate warnings about missing COMMENT support our $warningcount; # Used to suppress duplicate warnings about missing COMMENT support
our $ulogcount; # Used to suppress duplicate warnings about ULOG support
our $directive_callback; # Function to call in compiler_directive our $directive_callback; # Function to call in compiler_directive
our $shorewall_dir; # Shorewall Directory; if non-empty, search here first for files. our $shorewall_dir; # Shorewall Directory; if non-empty, search here first for files.
@ -837,6 +838,7 @@ sub initialize( $;$$$) {
$comment = ''; $comment = '';
$sr_comment = ''; $sr_comment = '';
$warningcount = 0; $warningcount = 0;
$ulogcount = 0;
# #
# Misc Globals # Misc Globals
# #
@ -4288,6 +4290,10 @@ sub validate_level( $;$ ) {
if ( $value =~ /^(NFLOG|ULOG)$/ ) { if ( $value =~ /^(NFLOG|ULOG)$/ ) {
my $olevel = $value; my $olevel = $value;
if ( $value eq 'ULOG' ) {
warning_message "ULOG is deprecated in favor of NFLOG. Support for ULOG will be removed in a future release" unless $ulogcount++;
}
if ( $qualifier =~ /^[(](.*)[)]$/ ) { if ( $qualifier =~ /^[(](.*)[)]$/ ) {
my @options = split /,/, $1; my @options = split /,/, $1;
my $prefix = lc $olevel; my $prefix = lc $olevel;