Invoke add_irule_extended rather than a hack that predated that function

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2016-01-27 19:01:23 -08:00
parent 6e9d5f45ec
commit 86f2e23f33

View File

@ -7835,10 +7835,10 @@ sub add_interface_options( $ ) {
} else { } else {
for my $interface ( @input_interfaces ) { for my $interface ( @input_interfaces ) {
$chain1ref = $input_chains{$interface}; $chain1ref = $input_chains{$interface};
my $ruleref = add_ijump ( $chainref , add_ijump_extended ( $chainref ,
j => $chain1ref->{name}, j => $chain1ref->{name},
@input_interfaces > 1 ? imatch_source_dev( $interface ) : () ); interface_origin( $interface ) ,
$ruleref->{comment} = interface_origin( $interface ) if @{$chain1ref->{rules}} && $config{TRACK_RULES} eq 'Yes'; @input_interfaces > 1 ? imatch_source_dev( $interface ) : () );
} }
} }
} else { } else {
@ -7851,7 +7851,10 @@ sub add_interface_options( $ ) {
} else { } else {
for my $interface ( @forward_interfaces ) { for my $interface ( @forward_interfaces ) {
$chain1ref = $forward_chains{$interface}; $chain1ref = $forward_chains{$interface};
add_ijump ( $chainref , j => $chain1ref->{name}, @forward_interfaces > 1 ? imatch_source_dev( $interface ) : () )->{comment} = interface_origin( $interface ) if @{$chain1ref->{rules}}; add_ijump_extended( $chainref ,
j => $chain1ref->{name},
interface_origin( $interface ) ,
@forward_interfaces > 1 ? imatch_source_dev( $interface ) : () );
} }
} }
} }