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

Improve get_keys*()

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2016-01-28 12:51:23 -08:00
parent d4bea3d3ec
commit 95a029316a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3724,7 +3724,7 @@ sub get_multi_sports( $ ) {
}
#
# Return an array of keys for the passed rule. 'dport' and 'comment' are omitted;
# Return an array of keys for the passed rule. 'dport', 'comment', and 'origin' are omitted;
#
sub get_keys( $ ) {
my %skip = ( dport => 1, comment => 1, origin => 1 );
@ -4002,10 +4002,12 @@ sub get_conntrack( $ ) {
}
#
# Return an array of keys for the passed rule. 'conntrack' and 'comment' are omitted;
# Return an array of keys for the passed rule. 'conntrack', 'comment' & origin are omitted;
#
sub get_keys1( $ ) {
sort grep $_ ne 'conntrack --ctstate' && $_ ne 'comment' && $_ ne 'origin', keys %{$_[0]};
my %skip = ( comment => 1, origin => 1 , 'conntrack --ctstate' => 1 );
sort grep ! $skip{$_}, keys %{$_[0]};
}
#