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

Add ihandle_original_dest()

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-07-04 14:37:24 -07:00
parent 131c1f432b
commit 5121634457
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7104,8 +7104,8 @@ sub verify_dest_interface( $$$$ ) {
# #
# Handles the original destination. Updates the passed rule and returns ( $networks, $exclusion, $rule ) # Handles the original destination. Updates the passed rule and returns ( $networks, $exclusion, $rule )
# #
sub handle_original_dest( $$$ ) { sub ihandle_original_dest( $$;@ ) {
my ( $origdest, $chainref, $rule ) = @_; my ( $origdest, $chainref, @rule ) = @_;
my ( $onets, $oexcl ); my ( $onets, $oexcl );
if ( $origdest eq '-' || ! have_capability( 'CONNTRACK_MATCH' ) ) { if ( $origdest eq '-' || ! have_capability( 'CONNTRACK_MATCH' ) ) {
@ -7129,14 +7129,14 @@ sub handle_original_dest( $$$ ) {
push_command( $chainref , 'if [ $address != 0.0.0.0 ]; then' , 'fi' ) if $optional; push_command( $chainref , 'if [ $address != 0.0.0.0 ]; then' , 'fi' ) if $optional;
$rule .= '-m conntrack --ctorigdst $address '; push @rule, ( conntrack => '--ctoregdst $address' );
} else { } else {
my $interface = $interfaces[0]; my $interface = $interfaces[0];
my $variable = get_interface_address( $interface ); my $variable = get_interface_address( $interface );
push_command( $chainref , "if [ $variable != 0.0.0.0 ]; then" , 'fi' ) if interface_is_optional( $interface ); push_command( $chainref , "if [ $variable != 0.0.0.0 ]; then" , 'fi' ) if interface_is_optional( $interface );
$rule .= "-m conntrack --ctorigdst $variable "; push @rule, ( conntrack => '--ctorigdst $variable' );
} }
$onets = $oexcl = ''; $onets = $oexcl = '';
@ -7157,13 +7157,13 @@ sub handle_original_dest( $$$ ) {
unless ( $onets ) { unless ( $onets ) {
my @oexcl = split_host_list( $oexcl, $config{DEFER_DNS_RESOLUTION} ); my @oexcl = split_host_list( $oexcl, $config{DEFER_DNS_RESOLUTION} );
if ( @oexcl == 1 ) { if ( @oexcl == 1 ) {
$rule .= match_orig_dest( "!$oexcl" ); push @rule, imatch_orig_dest( "!$oexcl" );
$oexcl = ''; $oexcl = '';
} }
} }
} }
( $onets, $oexcl, $rule ); ( $onets, $oexcl, @rule );
} }
# #