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

Accurately compare rule key values that are array references.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-11-26 08:03:02 -08:00
parent 15d95b6977
commit 3498076a96
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1146,6 +1146,24 @@ sub push_irule( $$$;@ ) {
$ruleref; $ruleref;
} }
#
# Compare two rule hash values. If a value is a reference, then it will be an array reference
#
sub compare_values( $$ ) {
my ( $value1, $value2 ) = @_;
return $value1 eq $value2 unless reftype $value1;
if ( reftype $value2 && @$value1 == @$value2 ) {
my $offset = 0;
for ( @$value1 ) {
return 0 unless $_ eq $value2->[$offset++];
}
1;
}
}
sub add_irule( $;@ ) { sub add_irule( $;@ ) {
my ( $chainref, @matches ) = @_; my ( $chainref, @matches ) = @_;
@ -2953,7 +2971,7 @@ sub combine_dports {
for my $key ( @keys1 ) { for my $key ( @keys1 ) {
last RULE unless $key eq $keys2[$keynum++]; last RULE unless $key eq $keys2[$keynum++];
next if $baseref->{$key} eq $ruleref->{$key}; next if compare_values( $baseref->{$key}, $ruleref->{$key} );
last RULE unless $key eq 'multiport' && $multi_sports eq get_multi_sports( $ruleref ); last RULE unless $key eq 'multiport' && $multi_sports eq get_multi_sports( $ruleref );
} }