Allow optional provider interfaces to match a wildcard

Signed-off-by: Tom Eastep <teastep@shorewall.net>

Shorewall/Perl/Shorewall/Providers.pm

@@ -686,6 +686,7 @@ sub process_a_provider( $ ) {
 			   interface         => $interface ,
 			   physical          => $physical ,
 			   optional          => $optional ,
+			   wildcard          => $interfaceref->{wildcard} || 0,
 			   gateway           => $gateway ,
 			   gatewaycase       => $gatewaycase ,
 			   shared            => $shared ,
@@ -2113,9 +2114,31 @@ sub provider_realm( $ ) {
 #
 sub handle_optional_interfaces( $ ) {
 
-    my ( $interfaces, $wildcards )  = find_interfaces_by_option1 'optional';
+    my @interfaces;
+    my $wildcards;
 
-    if ( @$interfaces ) {
+    #
+    # First do the provider interfacess. Those that are real providers will never have wildcard physical
+    # names but they might derive from wildcard interface entries. Optional interfaces which do not have
+    # wildcard physical names are also included in the providers table.
+    #
+    for my $providerref ( grep $_->{optional} , sort { $a->{number} <=> $b->{number} } values %providers ) {
+	push @interfaces, $providerref->{interface};
+	$wildcards ||= $providerref->{wildcard};
+    }
+
+    #
+    # Now do the optional wild interfaces
+    #
+    for my $interface ( grep interface_is_optional($_) && ! $provider_interfaces{$_}, all_real_interfaces ) {
+	push@interfaces, $interface;
+	unless ( $wildcards ) {
+	    my $interfaceref = find_interface($interface);
+	    $wildcards = 1 if $interfaceref->{wildcard};
+	}
+    }
+
+    if ( @interfaces ) {
 	my $require     = $config{REQUIRE_INTERFACE};
 	my $gencase     = shift;
 
@@ -2126,7 +2149,7 @@ sub handle_optional_interfaces( $ ) {
 	#
 	# Clear the '_IS_USABLE' variables
 	#
-	emit( join( '_', 'SW', uc var_base( get_physical( $_ ) ) , 'IS_USABLE=' ) ) for @$interfaces;
+	emit( join( '_', 'SW', uc var_base( get_physical( $_ ) ) , 'IS_USABLE=' ) ) for @interfaces;
 
 	if ( $wildcards ) {
 	    #
@@ -2143,11 +2166,13 @@ sub handle_optional_interfaces( $ ) {
 	    emit '';
 	}
 
-	for my $interface ( grep $provider_interfaces{$_}, @$interfaces ) {
+	for my $interface ( @interfaces ) {
-	    my $provider    = $provider_interfaces{$interface};
+	    if ( my $provider = $provider_interfaces{ $interface } ) {
 		my $physical     = get_physical $interface;
 		my $base         = uc var_base( $physical );
 		my $providerref  = $providers{$provider};
+		my $interfaceref = known_interface( $interface );
+		my $wildbase     = uc $interfaceref->{base};
 
 		emit( "$physical)" ), push_indent if $wildcards;
 
@@ -2172,17 +2197,16 @@ sub handle_optional_interfaces( $ ) {
 
 		emit( '    HAVE_INTERFACE=Yes' ) if $require;
 
-	    emit( "    SW_${base}_IS_USABLE=Yes" ,
+		emit( "    SW_${base}_IS_USABLE=Yes" );
-		  'fi' );
+		emit( "    SW_${wildbase}_IS_USABLE=Yes" ) if $interfaceref->{wildcard};
+		emit( 'fi' );
 
 		pop_indent;
 
 		emit( "fi\n" );
 
 		emit( ';;' ), pop_indent if $wildcards;
-	}
+	    } else {
-
-	for my $interface ( grep ! $provider_interfaces{$_}, @$interfaces ) {
 		my $physical    = get_physical $interface;
 		my $base        = uc var_base( $physical );
 		my $case        = $physical;
@@ -2213,6 +2237,7 @@ sub handle_optional_interfaces( $ ) {
 		    pop_indent;
 		}
 	    }
+	}
 
 	if ( $wildcards ) {
 	    emit( '*)' ,

Shorewall/Perl/Shorewall/Zones.pm

@@ -1587,7 +1587,7 @@ sub known_interface($)
 					       name     => $i ,
 					       number   => $interfaceref->{number} ,
 					       physical => $physical ,
-					       base     => var_base( $physical ) ,
+					       base     => $interfaceref->{base} ,
 					       wildcard => $interfaceref->{wildcard} ,
 					       zones    => $interfaceref->{zones} ,
 		                              };