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

Change interpretation of the log tag when LOGTAGONLY=Yes

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-01-06 13:10:18 -08:00
parent c41b9e596d
commit d4c9885c09
3 changed files with 63 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5393,8 +5393,15 @@ sub log_rule_limit( $$$$$$$$ ) {
} }
} else { } else {
if ( $tag ) { if ( $tag ) {
if ( $config{LOGTAGONLY} ) { if ( $config{LOGTAGONLY} && $tag ne ',' ) {
$chain = $tag; if ( $tag =~ /^,/ ) {
( $disposition = $tag ) =~ s/,//;
} elsif ( $tag =~ /,/ ) {
( $chain, $disposition ) = split ',', $tag;
} else {
$chain = $tag;
}
$tag = ''; $tag = '';
} else { } else {
$tag .= ' '; $tag .= ' ';

27
Shorewall/manpages/shorewall.conf.xml
View File

@ -1319,6 +1319,33 @@ net all DROP info</programlisting>then the chain name is 'net2all'
names may be used with log tags if you set LOGTAGONLY=Yes. With names may be used with log tags if you set LOGTAGONLY=Yes. With
LOGTAGONLY=Yes, if a log tag is specified then the tag is included LOGTAGONLY=Yes, if a log tag is specified then the tag is included
in the log prefix in place of the chain name.</para> in the log prefix in place of the chain name.</para>
<para>Beginning with Shorewall 4.5.12, when LOGTAGONLY=Yes, you have
more control over the generated log prefix. Beginning with that
release, the tag is interpreted as a <replaceable>chain
name</replaceable> and a <replaceable>disposition</replaceable>
separated by a comma. So this rule:</para>
<programlisting>#ACTION SOURCE DEST
LOG:info:foo,bar net fw</programlisting>
<para>would generate the following log prefix when using the default
LOGFORMAT setting:</para>
<simplelist>
<member>Shorewall:foo:bar:</member>
</simplelist>
<para>Similarly,</para>
<programlisting>#ACTION SOURCE DEST
LOG:info:,bar net fw</programlisting>
<para>would generate</para>
<simplelist>
<member>Shorewall:net2fw:bar:</member>
</simplelist>
</listitem> </listitem>
</varlistentry> </varlistentry>

27
Shorewall6/manpages/shorewall6.conf.xml
View File

@ -1167,6 +1167,33 @@ net all DROP info</programlisting>then the chain name is 'net2all'
names may be used with log tags if you set LOGTAGONLY=Yes. With names may be used with log tags if you set LOGTAGONLY=Yes. With
LOGTAGONLY=Yes, if a log tag is specified then the tag is included LOGTAGONLY=Yes, if a log tag is specified then the tag is included
in the log prefix in place of the chain name.</para> in the log prefix in place of the chain name.</para>
<para>Beginning with Shorewall 4.5.12, when LOGTAGONLY=Yes, you have
more control over the generated log prefix. Beginning with that
release, the tag is interpreted as a <replaceable>chain
name</replaceable> and a <replaceable>disposition</replaceable>
separated by a comma. So this rule:</para>
<programlisting>#ACTION SOURCE DEST
LOG:info:foo,bar net fw</programlisting>
<para> would generate the following log prefix when using the
default LOGFORMAT setting:</para>
<simplelist>
<member>Shorewall:foo:bar:</member>
</simplelist>
<para>Similarly,</para>
<programlisting>#ACTION SOURCE DEST
LOG:info:,bar net fw</programlisting>
<para>would generate</para>
<simplelist>
<member>Shorewall:net2fw:bar:</member>
</simplelist>
</listitem> </listitem>
</varlistentry> </varlistentry>