Another accounting fix

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6514 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-06-11 15:59:25 +00:00
parent 2e30e0f920
commit be972f1a7e

View File

@ -91,9 +91,12 @@ sub process_accounting_rule( $$$$$$$$$ ) {
$source = ALLIPv4 if $source eq 'any' || $source eq 'all'; $source = ALLIPv4 if $source eq 'any' || $source eq 'all';
if ( @bridges ) { if ( @bridges ) {
if ( $source =~ /^$firewall_zone:?/ ) { if ( $source =~ /^$firewall_zone:?(.*)$/ ) {
$source = $1;
$source = ALLIPv4 unless $source;
$restriction = OUTPUT_RESTRICT; $restriction = OUTPUT_RESTRICT;
$chain = 'accountout' unless $chain and $chain ne '-'; $chain = 'accountout' unless $chain and $chain ne '-';
$dest = ALLIPv4 if $dest eq 'any' || $dest eq 'all';
} else { } else {
$chain = 'accounting' unless $chain and $chain ne '-'; $chain = 'accounting' unless $chain and $chain ne '-';
if ( $dest eq 'any' || $dest eq 'all' || $dest eq ALLIPv4 ) { if ( $dest eq 'any' || $dest eq 'all' || $dest eq ALLIPv4 ) {