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

Move recent changes to trunk

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9359 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2009-01-31 00:22:00 +00:00
parent ca96c9795f
commit 0534de0b9c
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Shorewall-perl/Shorewall/Providers.pm
View File

@ -457,10 +457,10 @@ sub add_a_provider( $$$$$$$$ ) {
emit 'else'; emit 'else';
if ( $optional ) { if ( $optional ) {
emit ( " error_message \"WARNING: Interface $interface is not configured -- Provider $table ($number) not Added\"", emit ( " error_message \"WARNING: Interface $interface is not usable -- Provider $table ($number) not Added\"",
" ${base}_IS_UP=" ); " ${base}_IS_UP=" );
} else { } else {
emit( " fatal_error \"Interface $interface is not configured -- Provider $table ($number) Cannot be Added\"" ); emit( " fatal_error \"Interface $interface is not usable -- Provider $table ($number) Cannot be Added\"" );
} }
emit "fi\n"; emit "fi\n";
@ -632,9 +632,15 @@ sub setup_providers() {
emit ( " qt ip -$family route del default table " . MAIN_TABLE ) if $config{USE_DEFAULT_RT}; emit ( " qt ip -$family route del default table " . MAIN_TABLE ) if $config{USE_DEFAULT_RT};
emit ( " progress_message \"Default route '\$(echo \$DEFAULT_ROUTE | sed 's/\$\\s*//')' Added\"", emit ( " progress_message \"Default route '\$(echo \$DEFAULT_ROUTE | sed 's/\$\\s*//')' Added\"",
'else', 'else',
' error_message "WARNING: No Default route added (all \'balance\' providers are down)"', ' error_message "WARNING: No Default route added (all \'balance\' providers are down)"' );
' restore_default_route',
'fi', if ( $config{RESTORE_DEFAULT_ROUTE} ) {
emit ' restore_default_route && error_message "NOTICE: Default route restored"'
} else {
emit qq( qt ip -$family route del default table $table && error_message "WARNING: Default route deleted from table $table");
}
emit( 'fi',
'' ); '' );
} else { } else {
emit ( '#', emit ( '#',

5
Shorewall-perl/prog.header
View File

@ -936,6 +936,8 @@ restore_default_route() {
local default_route local default_route
default_route= default_route=
local route local route
local result
result=1
while read route ; do while read route ; do
case $route in case $route in
@ -951,6 +953,7 @@ restore_default_route() {
;; ;;
*) *)
qt ip -4 route replace $default_route && \ qt ip -4 route replace $default_route && \
result=0 && \
progress_message "Default Route (${default_route# }) restored" progress_message "Default Route (${default_route# }) restored"
;; ;;
esac esac
@ -968,6 +971,8 @@ restore_default_route() {
rm -f ${VARDIR}/default_route rm -f ${VARDIR}/default_route
fi fi
return $result
} }
# #

5
Shorewall-perl/prog.header6
View File

@ -856,6 +856,8 @@ restore_default_route() {
local default_route local default_route
default_route= default_route=
local route local route
local result
result=1
while read route ; do while read route ; do
case $route in case $route in
@ -871,6 +873,7 @@ restore_default_route() {
;; ;;
*) *)
qt ip -6 route replace $default_route && \ qt ip -6 route replace $default_route && \
result=0 && \
progress_message "Default Route (${default_route# }) restored" progress_message "Default Route (${default_route# }) restored"
;; ;;
esac esac
@ -888,6 +891,8 @@ restore_default_route() {
rm -f ${VARDIR}/default_route rm -f ${VARDIR}/default_route
fi fi
return $result
} }
# #