extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-20 01:37:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace '_IS_UP' with '_IS_USABLE'

Browse Source
This commit is contained in:
Tom Eastep 2009-06-16 14:25:13 -07:00
parent 2a7491ebf2
commit c00195e62a
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,7 +115,7 @@ sub setup_route_marking() {
my $mark = $providerref->{mark}; my $mark = $providerref->{mark};
my $base = uc chain_base $interface; my $base = uc chain_base $interface;
add_command( $chainref, qq(if [ -n "\$${base}_IS_UP" ]; then) ), incr_cmd_level( $chainref ) if $providerref->{optional}; add_command( $chainref, qq(if [ -n "\$${base}_IS_USABLE" ]; then) ), incr_cmd_level( $chainref ) if $providerref->{optional};
unless ( $marked_interfaces{$interface} ) { unless ( $marked_interfaces{$interface} ) {
add_rule $mangle_table->{PREROUTING} , "-i $interface -m mark --mark 0/$mask -j routemark"; add_rule $mangle_table->{PREROUTING} , "-i $interface -m mark --mark 0/$mask -j routemark";
@ -393,7 +393,7 @@ sub add_a_provider( ) {
my $realm = ''; my $realm = '';
start_provider( $table, $number, qq(if [ -n "\$${base}_IS_UP" ]; then) ) if $optional; start_provider( $table, $number, qq(if [ -n "\$${base}_IS_USABLE" ]; then) ) if $optional;
if ( $shared ) { if ( $shared ) {
my $variable = $providers{$table}{mac} = get_interface_mac( $gateway, $interface , $table ); my $variable = $providers{$table}{mac} = get_interface_mac( $gateway, $interface , $table );
@ -570,7 +570,7 @@ sub add_an_rtrule( ) {
if ( $optional ) { if ( $optional ) {
my $base = uc chain_base( $providers{$provider}{interface} ); my $base = uc chain_base( $providers{$provider}{interface} );
emit ( '', "if [ -n \$${base}_IS_UP ]; then" ); emit ( '', "if [ -n \$${base}_IS_USABLE ]; then" );
push_indent; push_indent;
} }
@ -785,7 +785,7 @@ sub lookup_provider( $ ) {
# #
# This function is called by the compiler when it is generating the initialize() function. # This function is called by the compiler when it is generating the initialize() function.
# It sets the ..._IS_UP interface variables appropriately for the optional interfaces # It sets the ..._IS_USABLE interface variables appropriately for the optional interfaces
# #
sub handle_optional_interfaces() { sub handle_optional_interfaces() {
@ -820,12 +820,15 @@ sub handle_optional_interfaces() {
emit qq(if interface_is_usable $interface; then); emit qq(if interface_is_usable $interface; then);
} }
} else { } else {
#
# Not a provider
#
emit qq(if interface_is_usable $interface; then); emit qq(if interface_is_usable $interface; then);
} }
emit( " ${base}_IS_UP=Yes" , emit( " ${base}_IS_USABLE=Yes" ,
'else' , 'else' ,
" ${base}_IS_UP=" , " ${base}_IS_USABLE=" ,
'fi' ); 'fi' );
} }
} }
@ -865,7 +868,7 @@ sub handle_stickiness( $ ) {
for my $chainref ( $stickyref, $setstickyref ) { for my $chainref ( $stickyref, $setstickyref ) {
add_command( $chainref, qq(if [ -n "\$${base}_IS_UP" ]; then) ), incr_cmd_level( $chainref ) if $providerref->{optional}; add_command( $chainref, qq(if [ -n "\$${base}_IS_USABLE" ]; then) ), incr_cmd_level( $chainref ) if $providerref->{optional};
if ( $chainref->{name} eq 'sticky' ) { if ( $chainref->{name} eq 'sticky' ) {
$rule1 = $_; $rule1 = $_;
@ -897,7 +900,7 @@ sub handle_stickiness( $ ) {
my $stickoref = ensure_mangle_chain 'sticko'; my $stickoref = ensure_mangle_chain 'sticko';
for my $chainref ( $stickoref, $setstickoref ) { for my $chainref ( $stickoref, $setstickoref ) {
add_command( $chainref, qq(if [ -n "\$${base}_IS_UP" ]; then) ), incr_cmd_level( $chainref ) if $providerref->{optional}; add_command( $chainref, qq(if [ -n "\$${base}_IS_USABLE" ]; then) ), incr_cmd_level( $chainref ) if $providerref->{optional};
if ( $chainref->{name} eq 'sticko' ) { if ( $chainref->{name} eq 'sticko' ) {
$rule1 = $_; $rule1 = $_;

2
Shorewall/Perl/Shorewall/Rules.pm
View File

@ -631,7 +631,7 @@ sub add_common_rules() {
my $base = uc chain_base $interface; my $base = uc chain_base $interface;
my $variable = get_interface_gateway $interface; my $variable = get_interface_gateway $interface;
add_command $chainref, qq(if [ -n "\$${base}_IS_UP" -a -n "$variable" ]; then); add_command $chainref, qq(if [ -n "\$${base}_IS_USABLE" -a -n "$variable" ]; then);
add_command $chainref, qq( echo -A $chainref->{name} -i $interface -s $variable -p udp -j ACCEPT >&3); add_command $chainref, qq( echo -A $chainref->{name} -i $interface -s $variable -p udp -j ACCEPT >&3);
add_command $chainref, qq(fi); add_command $chainref, qq(fi);
} }