diff --git a/Shorewall/action.Broadcast b/Shorewall/action.Broadcast index 8c85211c5..2eda6bc9a 100644 --- a/Shorewall/action.Broadcast +++ b/Shorewall/action.Broadcast @@ -37,10 +37,10 @@ use Shorewall::IPAddrs; use Shorewall::Config; use Shorewall::Chains; -my $chainref = get_action_chain; +my $chainref = get_action_chain; my ( $action, $audit ) = get_action_params( 2 ); -my ( $level, $tag ) = get_action_logging; -my $target = require_audit ( $action , $audit ); +my ( $level, $tag ) = get_action_logging; +my $target = require_audit ( $action , $audit ); fatal_error "Invalid parameter to action Broadcast" if supplied $audit && $audit ne 'audit'; @@ -55,26 +55,16 @@ if ( have_capability( 'ADDRTYPE' ) ) { add_jump $chainref, $target, 0, "-m addrtype --dst-type MULTICAST "; add_jump $chainref, $target, 0, "-m addrtype --dst-type ANYCAST "; } else { - if ( $family == F_IPV4 ) { - add_commands $chainref, 'for address in $ALL_BCASTS; do'; - } else { - add_commands $chainref, 'for address in $ALL_BCASTS; do'; - } - + add_commands $chainref, 'for address in $ALL_BCASTS; do'; incr_cmd_level $chainref; log_rule_limit $level, $chainref, 'Broadcast' , $action, '', $tag, 'add', ' -d $address ' if $level ne ''; add_jump $chainref, $target, 0, "-d \$address "; decr_cmd_level $chainref; add_commands $chainref, 'done'; - - if ( $family == F_IPV4 ) { - log_rule_limit $level, $chainref, 'Broadcast' , $action, '', $tag, 'add', ' -d 224.0.0.0/4 ' if $level ne ''; - add_jump $chainref, $target, 0, '-d 224.0.0.0/4 '; - } else { - log_rule_limit( $level, $chainref, 'Broadcast' , $action, '', $tag, 'add', join( ' ', '-d', IPv6_MULTICAST . ' ' ) ) if $level ne ''; - add_jump $chainref, $target, 0, join( ' ', '-d', IPv6_MULTICAST . ' ' ); - } } + +log_rule_limit $level, $chainref, 'Broadcast' , $action, '', $tag, 'add', ' -d 224.0.0.0/4 ' if $level ne ''; +add_jump $chainref, $target, 0, '-d 224.0.0.0/4 '; 1;