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

Apply Mr-4's 4a patch (modified)

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-04-27 07:04:40 -07:00
parent 20d38e8b52
commit 1012251957
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,9 +237,9 @@ sub process_accounting_rule1( $$$$$$$$$$$ ) {
for ( my @objects = split_nfacct_list $1 ) {
validate_nfobject( $_, 1 );
if ( s/!$// ) {
$prerule .= "-m nfacct --nfacct-name $_ ";
$prerule .= do_nfacct( $_ );
} else {
$rule .= "-m nfacct --nfacct-name $_ ";
$rule .= do_nfacct( $_ );
}
}
} elsif ( $action eq 'INLINE' ) {

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

@ -211,6 +211,7 @@ our %EXPORT_TAGS = (
do_probability
do_condition
do_dscp
do_nfacct
have_ipset_rules
record_runtime_address
verify_address_variables
@ -5175,6 +5176,13 @@ sub do_dscp( $ ) {
"-m dscp ${invert}--dscp $value ";
}
#
# Return nfacct match
#
sub do_nfacct( $ ) {
"-m nfacct --nfacct-name @_ ";
}
#
# Match Source Interface
#
@ -5453,7 +5461,7 @@ sub match_source_net( $;$\$ ) {
require_capability 'NFACCT_MATCH', "An nfacct object list ($3)", 's';
for ( my @objects = split_list $3, 'nfacct' ) {
validate_nfobject( $_ );
$result .= "-m nfacct --nfacct-name $_ ";
$result .= do_nfacct( $_ );
}
}
@ -5473,7 +5481,7 @@ sub match_source_net( $;$\$ ) {
require_capability 'NFACCT_MATCH', "An nfacct object list ($3)", 's';
for ( my @objects = split_list $3, 'nfacct' ) {
validate_nfobject( $_ );
$result .= "-m nfacct --nfacct-name $_ ";
$result .= do_nfacct( $_ );
}
}
}
@ -5627,7 +5635,7 @@ sub match_dest_net( $;$ ) {
require_capability 'NFACCT_MATCH', "An nfacct object list ($3)", 's';
for ( my @objects = split_list $3, 'nfacct' ) {
validate_nfobject( $_ );
$result .= "-m nfacct --nfacct-name $_ ";
$result .= do_nfacct( $_ );
}
}
@ -5649,7 +5657,7 @@ sub match_dest_net( $;$ ) {
require_capability 'NFACCT_MATCH', "An nfacct object list ($3)", 's';
for ( my @objects = split_list $3, 'nfacct' ) {
validate_nfobject( $_ );
$result .= "-m nfacct --nfacct-name $_ ";
$result .= do_nfacct( $_ );
}
}