holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Add 'optional' interfaces to updown processing.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-05-15 17:06:00 -07:00
parent a3589dc6e9
commit 749d6be64e
1 changed files with 56 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1242,12 +1242,35 @@ sub compile_updown() {
push_indent; push_indent;
emit( 'local state',
'state=cleared',
'',
'if shorewall_is_up; then',
' state=started',
'elif [ -f ${VARDIR}/state ]; then',
' case "$(cat ${VARDIR}/state)" in',
' Stopped*|Closed*)',
' state=stopped',
' ;;',
' Cleared*)',
' ;;',
' *)',
' state=unknown',
' ;;',
' esac',
'else',
' state=unknown',
'fi',
''
);
emit( 'case $1 in' ); emit( 'case $1 in' );
push_indent; push_indent;
my $ignore = find_interfaces_by_option 'ignore'; my $ignore = find_interfaces_by_option 'ignore';
my $required = find_interfaces_by_option 'required'; my $required = find_interfaces_by_option 'required';
my $optional = find_interfaces_by_option 'optional';
if ( @$ignore ) { if ( @$ignore ) {
my $interfaces = join '|', map $interfaces{$_}->{physical}, @$ignore; my $interfaces = join '|', map $interfaces{$_}->{physical}, @$ignore;
@ -1267,12 +1290,7 @@ sub compile_updown() {
emit( "$interfaces)", emit( "$interfaces)",
' if [ "$COMMAND" = up ]; then', ' if [ "$COMMAND" = up ]; then',
' if shorewall_is_started; then', ' COMMAND=start',
' COMMAND=restart',
' else',
' COMMAND=start',
' fi',
'',
' detect_configuration', ' detect_configuration',
' define_firewall', ' define_firewall',
' else', ' else',
@ -1284,22 +1302,40 @@ sub compile_updown() {
); );
} }
if ( @$optional ) {
my $interfaces = join '|', map $interfaces{$_}->{physical}, @$optional;
$interfaces =~ s/\+/*/;
emit( "$interfaces)",
' if [ "$COMMAND" = up ]; then',
' echo 0 > ${VARDIR}/${1}.state',
' else',
' echo 1 > ${VARDIR}/${1}.state',
' fi',
'',
' if [ "$state" = started ]; then',
' COMMAND=restart',
' detect_configuration',
' define_firewall',
' fi',
' ;;',
);
}
emit( "*)", emit( "*)",
' if [ "$COMMAND" = up ]; then', ' case $state in',
' if shorewall_is_started; then', ' started)',
' COMMAND=restart', ' COMMAND=restart',
' else', ' detect_configuration',
' COMMAND=start', ' define_firewall',
' fi', ' ;;',
'', ' cleared|unknown)',
' detect_configuration', ' COMMAND=close',
' define_firewall', ' detect_configuration',
' elif shorewall_is_started; then', ' stop_firewall',
' COMMAND=restart', ' ;;',
' detect_configuration', ' esac',
' define_firewall',
' fi',
' ;;'
); );
pop_indent; pop_indent;