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

A couple of tweaks

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6420 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-05-20 15:14:40 +00:00
parent 1b018ac7c7
commit a9909fd369
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-common/lib.base
View File

@ -838,7 +838,7 @@ get_routed_networks() # $1 = interface name, $2-n = Fatal error message
echo "WARNING: default route ignored on interface $1" >&2
fi
;;
multicast|broadcast|prohibit|nat|throw|via)
multicast|broadcast|prohibit|nat|throw|nexthop)
;;
*)
[ "$address" = "${address%/*}" ] && address="${address}/32"

10
Shorewall-perl/Shorewall/IPAddrs.pm
View File

@ -73,14 +73,14 @@ sub validate_address( $ ) {
}
sub validate_net( $ ) {
my ($net, $vlsm) = split '/', $_[0];
my ($net, $vlsm, $rest) = split( '/', $_[0], 3 );
if ( defined $vlsm ) {
fatal_error "Invalid VLSM ($vlsm)" unless $vlsm =~ /^\d+$/ && $vlsm <= 32;
fatal_error "Invalid IP address ($net)" unless valid_address $net;
fatal_error "Invalid VLSM ($vlsm)" unless $vlsm =~ /^\d+$/ && $vlsm <= 32;
fatal_error "Invalid Network address ($_[0])" if defined $rest;
fatal_error "Invalid IP address ($net)" unless valid_address $net;
} else {
fatal_error "Invalid Network address ($_[0])" if $_[0] =~ '/';
fatal_error "Invalid Network address ($_[0])" unless defined $net;
fatal_error "Invalid Network address ($_[0])" if $_[0] =~ '/' || ! defined $net;
validate_address $net;
}
}

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

@ -59,7 +59,7 @@ my %providers = ( 'local' => { number => LOCAL_NUMBER , mark => 0 } ,
my @providers;
#
# Set up marking for 'tracked' interfaces. Unline in Shorewall 3.x, we add these rules unconditionally, even if the associated interface isn't up.
# Set up marking for 'tracked' interfaces. Unlike in Shorewall 3.x, we add these rules unconditionally, even if the associated interface isn't up.
#
sub setup_route_marking() {
my $mask = $config{HIGH_ROUTE_MARKS} ? '0xFF00' : '0xFF';
@ -69,7 +69,7 @@ sub setup_route_marking() {
require_capability( 'CONNMARK' , 'the provider \'track\' option' , 's' );
add_rule $mangle_table->{PREROUTING} , "-m connmark ! --mark 0/$mask -j CONNMARK --restore-mark --mask $mask";
add_rule $mangle_table->{OUTPUT} , " -m connmark ! --mark 0/$mask -j CONNMARK --restore-mark --mask $mask";
add_rule $mangle_table->{OUTPUT} , "-m connmark ! --mark 0/$mask -j CONNMARK --restore-mark --mask $mask";
my $chainref = new_chain 'mangle', 'routemark';
@ -147,8 +147,8 @@ sub setup_providers() {
fatal_error "Duplicate provider ( $table )" if $providers{$table};
for my $provider ( keys %providers ) {
fatal_error "Duplicate provider number ( $number )" if $providers{$provider}{number} == $number;
for my $providerref ( values %providers ) {
fatal_error "Duplicate provider number ( $number )" if $providerref->{number} == $number;
}
emit "#\n# Add Provider $table ($number)\n#";