extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-18 12:20:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

More Shorewall-init fixes

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-06-01 14:01:58 -07:00
parent f266d9a4dc
commit 402e155148
3 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall-init/ifupdown.sh
View File

@ -106,12 +106,6 @@ if [ -f /etc/debian_version ]; then
else
exit 0
fi
case "$PHASE" in
post-*)
exit 0
;;
esac
;;
esac
elif [ -f /etc/SuSE-release ]; then

32
Shorewall/Perl/Shorewall/Providers.pm
View File

@ -1539,19 +1539,25 @@ sub compile_updown() {
}
}
emit( "*)",
' case $state in',
' started)',
' COMMAND=restart',
' progress_message3 "$g_product attempting restart"',
' detect_configuration',
' define_firewall',
' ;;',
' *)',
' progress_message3 "$COMMAND on interface $1 ignored"',
' ;;',
' esac',
);
if ( my @plain_interfaces = all_plain_interfaces ) {
my $interfaces = join ( '|', map get_physical( $_ ), @plain_interfaces );
$interfaces =~ s/\+/*/g;
emit( "$interfaces)",
' case $state in',
' started)',
' COMMAND=restart',
' progress_message3 "$g_product attempting restart"',
' detect_configuration',
' define_firewall',
' ;;',
' *)',
' progress_message3 "$COMMAND on interface $1 ignored"',
' ;;',
' esac',
);
}
pop_indent;

17
Shorewall/Perl/Shorewall/Zones.pm
View File

@ -62,6 +62,7 @@ our @EXPORT = qw( NOTHING
validate_interfaces_file
all_interfaces
all_real_interfaces
all_plain_interfaces
all_bridges
interface_number
find_interface
@ -72,6 +73,7 @@ our @EXPORT = qw( NOTHING
port_to_bridge
source_port_to_bridge
interface_is_optional
interface_is_required
find_interfaces_by_option
find_interfaces_by_option1
get_interface_option
@ -1417,6 +1419,21 @@ sub interface_is_optional($) {
$optionsref && $optionsref->{optional};
}
#
# Return the 'required' setting of the passed interface
#
sub interface_is_required($) {
my $optionsref = $interfaces{$_[0]}{options};
$optionsref && $optionsref->{required};
}
#
# Return a list of real interfaces that are neither
#
sub all_plain_interfaces() {
grep ! ( $_ eq '%vserver%' || interface_is_optional($_) || interface_is_required($_) ), @interfaces;
}
#
# Returns reference to array of interfaces with the passed option
#