mirror of
https://gitlab.com/shorewall/code.git
synced 2025-03-11 04:48:12 +01:00
Massage fix for multicast and nets=
This commit is contained in:
parent
b30da86cce
commit
b778f04b1a
@ -624,7 +624,6 @@ sub add_group_to_zone($$$$$)
|
|||||||
if ( $host eq ALLIP ) {
|
if ( $host eq ALLIP ) {
|
||||||
fatal_error "Duplicate Host Group ($interface:$host) in zone $zone" if @newnetworks;
|
fatal_error "Duplicate Host Group ($interface:$host) in zone $zone" if @newnetworks;
|
||||||
$interfaces{$interface}{zone} = $zone;
|
$interfaces{$interface}{zone} = $zone;
|
||||||
$options->{multicast} = 0;
|
|
||||||
$allip = 1;
|
$allip = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -895,11 +894,15 @@ sub process_interface( $ ) {
|
|||||||
zone => ''
|
zone => ''
|
||||||
};
|
};
|
||||||
|
|
||||||
$nets = [ allip ] unless $nets;
|
|
||||||
|
|
||||||
if ( $zone ) {
|
if ( $zone ) {
|
||||||
|
$nets ||= [ allip ];
|
||||||
add_group_to_zone( $zone, $zoneref->{type}, $interface, $nets, $hostoptionsref );
|
add_group_to_zone( $zone, $zoneref->{type}, $interface, $nets, $hostoptionsref );
|
||||||
add_group_to_zone( $zone, $zoneref->{type}, $interface, [ IPv4_MULTICAST ], { destonly => 1 } ) if $hostoptionsref->{multicast};
|
add_group_to_zone( $zone,
|
||||||
|
$zoneref->{type},
|
||||||
|
$interface,
|
||||||
|
[ IPv4_MULTICAST ],
|
||||||
|
{ destonly => 1 } ) if $hostoptionsref->{multicast} && $interfaces{$interface}{zone} ne $zone;
|
||||||
}
|
}
|
||||||
|
|
||||||
progress_message " Interface \"$currentline\" Validated";
|
progress_message " Interface \"$currentline\" Validated";
|
||||||
|
Loading…
Reference in New Issue
Block a user