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

Change error messages

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7712 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-11-21 21:30:21 +00:00
parent 1d3eca5541
commit 3e7b4a41b3
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,7 +205,7 @@ sub add_a_provider( $$$$$$$$ ) {
if ( defined $address ) { if ( defined $address ) {
validate_address $address, 0; validate_address $address, 0;
$shared = 1; $shared = 1;
require_capability 'REALM_MATCH', "Multiple Providers through one interface", "s"; require_capability 'REALM_MATCH', "Configuring multiple providers through one interface", "s";
} }
fatal_error "Unknown Interface ($interface)" unless known_interface $interface; fatal_error "Unknown Interface ($interface)" unless known_interface $interface;
@ -216,19 +216,18 @@ sub add_a_provider( $$$$$$$$ ) {
emit "if interface_is_usable $interface; then"; emit "if interface_is_usable $interface; then";
push_indent; push_indent;
my $iface = chain_base $interface;
emit "qt ip route flush table $number"; emit "qt ip route flush table $number";
emit "echo \"qt ip route flush table $number\" >> \${VARDIR}/undo_routing"; emit "echo \"qt ip route flush table $number\" >> \${VARDIR}/undo_routing";
if ( $gateway eq 'detect' ) { if ( $gateway eq 'detect' ) {
$address = get_interface_address $interface unless $address; $address = get_interface_address $interface unless $address;
$gateway = get_interface_gateway $interface; $gateway = get_interface_gateway $interface;
} elsif ( $gateway && $gateway ne '-' ) { } elsif ( $gateway && $gateway ne '-' ) {
validate_address $gateway, 0; validate_address $gateway, 0;
$address = get_interface_address $interface unless $address; $address = get_interface_address $interface unless $address;
} else { } else {
fatal_error "Multiple Providers through one interface requires a gateway" if $shared; fatal_error "Configuring multiple providers through one interface requires a gateway" if $shared;
$gateway = ''; $gateway = '';
emit "run_ip route add default dev $interface table $number"; emit "run_ip route add default dev $interface table $number";
} }
@ -341,9 +340,9 @@ sub add_a_provider( $$$$$$$$ ) {
); );
} }
} elsif ( $shared ) { } elsif ( $shared ) {
emit "qt ip rule del from $address" if $config{DELETE_THEN_ADD}; emit "qt ip rule del from $address" if $config{DELETE_THEN_ADD};
emit "run_ip rule add from $address pref 20000 table $number"; emit( "run_ip rule add from $address pref 20000 table $number" ,
emit "echo \"qt ip rule del from $address\" >> \${VARDIR}/undo_routing"; "echo \"qt ip rule del from $address\" >> \${VARDIR}/undo_routing" );
} else { } else {
my $rulebase = 20000 + ( 256 * ( $number - 1 ) ); my $rulebase = 20000 + ( 256 * ( $number - 1 ) );