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

Pass many fewer arguments while processing accounting rules

Browse Source
This commit is contained in:
Tom Eastep 2009-05-05 11:25:56 -07:00
parent 293987a383
commit e68b571abe
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Shorewall/Perl/Shorewall/Accounting.pm
View File

@ -59,11 +59,16 @@ INIT {
# #
# Accounting # Accounting
# #
sub process_accounting_rule( $$$$$$$$$ ) { sub process_accounting_rule( ) {
our $jumpchainref; our $jumpchainref;
my ($action, $chain, $source, $dest, $proto, $ports, $sports, $user, $mark ) = @_; my ($action, $chain, $source, $dest, $proto, $ports, $sports, $user, $mark ) = split_line1 1, 9, 'Accounting File';
if ( $action eq 'COMMENT' ) {
process_comment;
return 0;
}
our $disposition = ''; our $disposition = '';
@ -170,6 +175,8 @@ sub process_accounting_rule( $$$$$$$$$ ) {
'' , '' ,
'' ; '' ;
} }
return 1;
} }
sub setup_accounting() { sub setup_accounting() {
@ -180,17 +187,7 @@ sub setup_accounting() {
my $nonEmpty = 0; my $nonEmpty = 0;
while ( read_a_line ) { $nonEmpty |= process_accounting_rule while read_a_line;
my ( $action, $chain, $source, $dest, $proto, $ports, $sports, $user, $mark ) = split_line1 1, 9, 'Accounting File';
if ( $action eq 'COMMENT' ) {
process_comment;
} else {
$nonEmpty = 1;
process_accounting_rule $action, $chain, $source, $dest, $proto, $ports, $sports, $user, $mark;
}
}
fatal_error "Accounring rules are isolated" if $nonEmpty && ! $filter_table->{accounting}; fatal_error "Accounring rules are isolated" if $nonEmpty && ! $filter_table->{accounting};