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

Reduce the Beta3 patch footprint by making the second arg to known_interface() optional

Browse Source
This commit is contained in:
Tom Eastep 2010-08-30 16:43:30 -07:00
parent add76ed14e
commit 1da6d51d1a
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Shorewall/Perl/Shorewall/Chains.pm
View File

@ -2437,7 +2437,7 @@ sub do_length( $ ) {
# #
sub match_source_dev( $ ) { sub match_source_dev( $ ) {
my $interface = shift; my $interface = shift;
my $interfaceref = known_interface( $interface, 0 ); my $interfaceref = known_interface( $interface );
$interface = $interfaceref->{physical} if $interfaceref; $interface = $interfaceref->{physical} if $interfaceref;
return '' if $interface eq '+'; return '' if $interface eq '+';
if ( $interfaceref && $interfaceref->{options}{port} ) { if ( $interfaceref && $interfaceref->{options}{port} ) {
@ -2452,7 +2452,7 @@ sub match_source_dev( $ ) {
# #
sub match_dest_dev( $ ) { sub match_dest_dev( $ ) {
my $interface = shift; my $interface = shift;
my $interfaceref = known_interface( $interface, 0 ); my $interfaceref = known_interface( $interface );
$interface = $interfaceref->{physical} if $interfaceref; $interface = $interfaceref->{physical} if $interfaceref;
return '' if $interface eq '+'; return '' if $interface eq '+';
if ( $interfaceref && $interfaceref->{options}{port} ) { if ( $interfaceref && $interfaceref->{options}{port} ) {
@ -3251,7 +3251,7 @@ sub expand_rule( $$$$$$$$$$;$ )
# Verify Interface, if any # Verify Interface, if any
# #
if ( $iiface ) { if ( $iiface ) {
fatal_error "Unknown Interface ($iiface)" unless known_interface( $iiface, 0 ); fatal_error "Unknown Interface ($iiface)" unless known_interface $iiface;
if ( $restriction & POSTROUTE_RESTRICT ) { if ( $restriction & POSTROUTE_RESTRICT ) {
# #
@ -3341,7 +3341,7 @@ sub expand_rule( $$$$$$$$$$;$ )
# Verify Destination Interface, if any # Verify Destination Interface, if any
# #
if ( $diface ) { if ( $diface ) {
fatal_error "Unknown Interface ($diface)" unless known_interface( $diface, 0 ); fatal_error "Unknown Interface ($diface)" unless known_interface $diface;
if ( $restriction & PREROUTE_RESTRICT ) { if ( $restriction & PREROUTE_RESTRICT ) {
# #

6
Shorewall/Perl/Shorewall/Nat.pm
View File

@ -142,7 +142,7 @@ sub process_one_masq( )
$rule .= "-m realm --realm $realm "; $rule .= "-m realm --realm $realm ";
} }
fatal_error "Unknown interface ($interface)" unless my $interfaceref = known_interface( $interface, 0 ); fatal_error "Unknown interface ($interface)" unless my $interfaceref = known_interface( $interface );
unless ( $interfaceref->{root} ) { unless ( $interfaceref->{root} ) {
$rule .= match_dest_dev( $interface ); $rule .= match_dest_dev( $interface );
@ -314,7 +314,7 @@ sub do_one_nat( $$$$$ )
my $rulein = ''; my $rulein = '';
my $ruleout = ''; my $ruleout = '';
fatal_error "Unknown interface ($interface)" unless my $interfaceref = known_interface( $interface, 0 ); fatal_error "Unknown interface ($interface)" unless my $interfaceref = known_interface( $interface );
unless ( $interfaceref->{root} ) { unless ( $interfaceref->{root} ) {
$rulein = match_source_dev $interface; $rulein = match_source_dev $interface;
@ -408,7 +408,7 @@ sub setup_netmap() {
my $ruleout = ''; my $ruleout = '';
my $iface = $interface; my $iface = $interface;
fatal_error "Unknown interface ($interface)" unless my $interfaceref = known_interface( $interface, 0 ); fatal_error "Unknown interface ($interface)" unless my $interfaceref = known_interface( $interface );
unless ( $interfaceref->{root} ) { unless ( $interfaceref->{root} ) {
$rulein = match_source_dev( $interface ); $rulein = match_source_dev( $interface );

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

@ -177,7 +177,7 @@ sub setup_ecn()
my ($interface, $hosts ) = split_line 1, 2, 'ecn file entry'; my ($interface, $hosts ) = split_line 1, 2, 'ecn file entry';
fatal_error "Unknown interface ($interface)" unless known_interface( $interface, 0 ); fatal_error "Unknown interface ($interface)" unless known_interface( $interface );
$interfaces{$interface} = 1; $interfaces{$interface} = 1;
@ -328,7 +328,7 @@ sub process_routestopped() {
my $interfaceref; my $interfaceref;
fatal_error "Unknown interface ($interface)" unless $interfaceref = known_interface( $interface, 0 ); fatal_error "Unknown interface ($interface)" unless $interfaceref = known_interface( $interface );
$hosts = ALLIP unless $hosts && $hosts ne '-'; $hosts = ALLIP unless $hosts && $hosts ne '-';
my $routeback = 0; my $routeback = 0;
@ -769,7 +769,7 @@ sub setup_mac_lists( $ ) {
my $targetref = $maclist_targets{$disposition}; my $targetref = $maclist_targets{$disposition};
fatal_error "Invalid DISPOSITION ($original_disposition)" if ! $targetref || ( ( $table eq 'mangle' ) && ! $targetref->{mangle} ); fatal_error "Invalid DISPOSITION ($original_disposition)" if ! $targetref || ( ( $table eq 'mangle' ) && ! $targetref->{mangle} );
fatal_error "Unknown Interface ($interface)" unless known_interface( $interface, 0 ); fatal_error "Unknown Interface ($interface)" unless known_interface $interface;
fatal_error "No hosts on $interface have the maclist option specified" unless $maclist_interfaces{$interface}; fatal_error "No hosts on $interface have the maclist option specified" unless $maclist_interfaces{$interface};
my $chainref = $chain_table{$table}{( $ttl ? macrecent_target $interface : mac_chain $interface )}; my $chainref = $chain_table{$table}{( $ttl ? macrecent_target $interface : mac_chain $interface )};

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

@ -1155,7 +1155,7 @@ sub map_physical( $$ ) {
# If the passed name matches a wildcard and 'cache' is true, an entry for the name is added in # If the passed name matches a wildcard and 'cache' is true, an entry for the name is added in
# %interfaces. # %interfaces.
# #
sub known_interface($$) sub known_interface($;$)
{ {
my ( $interface, $cache ) = @_; my ( $interface, $cache ) = @_;
my $interfaceref = $interfaces{$interface}; my $interfaceref = $interfaces{$interface};
@ -1230,7 +1230,7 @@ sub get_physical( $ ) {
# #
sub physical_name( $ ) { sub physical_name( $ ) {
my $device = shift; my $device = shift;
my $devref = known_interface( $device, 0 ); my $devref = known_interface $device;
$devref ? $devref->{physical} : $device; $devref ? $devref->{physical} : $device;
} }