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

Fix LOGMARK

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-07-19 06:53:49 -07:00
parent 58de3dd3c1
commit 8b56e16bf9
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/Perl/Shorewall/Chains.pm
View File

@ -3934,7 +3934,7 @@ sub log_rule_limit( $$$$$$$$ ) {
$prefix = "-j $level --nflog-prefix \"$prefix\" "; $prefix = "-j $level --nflog-prefix \"$prefix\" ";
} elsif ( $level =~ '^LOGMARK' ) { } elsif ( $level =~ '^LOGMARK' ) {
$prefix = join( '', substr( $prefix, 0, 12 ) , ':' ) if length $prefix > 13; $prefix = join( '', substr( $prefix, 0, 12 ) , ':' ) if length $prefix > 13;
$prefix = "-j LOGMARK --log-level $level --log-prefix \"$prefix\" "; $prefix = "-j $level --log-prefix \"$prefix\" ";
} else { } else {
$prefix = "-j LOG $globals{LOGPARMS}--log-level $level --log-prefix \"$prefix\" "; $prefix = "-j LOG $globals{LOGPARMS}--log-level $level --log-prefix \"$prefix\" ";
} }

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

@ -2132,10 +2132,21 @@ sub validate_level( $ ) {
return $rawlevel; return $rawlevel;
} }
if ( $level eq 'LOGMARK' ) { if ( $level =~ /^LOGMARK --/ ) {
require_capability ( 'LOG_TARGET' , 'A log level other than NONE', 's' );
return $rawlevel;
}
if ( $level =~ /LOGMARK[(](.*)[)]$/ ) {
my $sublevel = $1;
$sublevel = $validlevels{$sublevel} unless $sublevel =~ /^[0-7]$/;
level_error( $level ) unless defined $sublevel =~ /^[0-7]$/;
require_capability ( 'LOG_TARGET' , 'A log level other than NONE', 's' ); require_capability ( 'LOG_TARGET' , 'A log level other than NONE', 's' );
require_capability( 'LOGMARK_TARGET' , 'LOGMARK', 's' ); require_capability( 'LOGMARK_TARGET' , 'LOGMARK', 's' );
return 'LOGMARK'; return "LOGMARK --log-level $sublevel";
} }
level_error( $rawlevel ); level_error( $rawlevel );

14
manpages/shorewall.conf.xml
View File

@ -72,7 +72,19 @@
from <ulink from <ulink
url="http://www.netfilter.org/projects/ulogd/index.html">http://www.netfilter.org/projects/ulogd/index.html</ulink> url="http://www.netfilter.org/projects/ulogd/index.html">http://www.netfilter.org/projects/ulogd/index.html</ulink>
and can be configured to log all Shorewall messages to their own log and can be configured to log all Shorewall messages to their own log
file</para> file.</para>
<para>Beginning with Shorewall 4.4.22, LOGMARK is also a valid level which
logs the packet's mark value along with the other usual information. The
syntax is:</para>
<simplelist>
<member><emphasis
role="bold">LOGMARK</emphasis><replaceable>(priority)</replaceable></member>
</simplelist>
<para>where <replaceable>priority</replaceable> is one of the levels
listed in the list above.</para>
<para>The following options may be set in shorewall.conf.</para> <para>The following options may be set in shorewall.conf.</para>