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

Require server with DNAT

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6229 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-05-04 14:16:18 +00:00
parent c7bc204ba0
commit 3f2b8cda25
1 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Shorewall-perl/Shorewall/Rules.pm
View File

@ -884,8 +884,7 @@ sub process_rule1 ( $$$$$$$$$$ ) {
# #
# We will be called recursively for each rule in the macro body # We will be called recursively for each rule in the macro body
# #
process_macro process_macro( $macros{$basictarget},
$macros{$basictarget},
$target , $target ,
$param , $param ,
$source, $source,
@ -896,7 +895,7 @@ sub process_rule1 ( $$$$$$$$$$ ) {
$origdest, $origdest,
$ratelimit, $ratelimit,
$user, $user,
$mark; $mark );
return; return;
} }
# #
@ -995,6 +994,9 @@ sub process_rule1 ( $$$$$$$$$$ ) {
$server = $dest; $server = $dest;
$serverport = ''; $serverport = '';
} }
fatal_error "DNAT Rules Require a Server" if $basictarget eq 'DNAT' && $server eq ALLIPv4;
# #
# After DNAT, dest port will be the server port # After DNAT, dest port will be the server port
# #
@ -1040,8 +1042,7 @@ sub process_rule1 ( $$$$$$$$$$ ) {
# #
# And generate the nat table rule(s) # And generate the nat table rule(s)
# #
expand_rule expand_rule ( ensure_chain ('nat' , $zones{$sourcezone}{type} eq 'firewall' ? 'OUTPUT' : dnat_chain $sourcezone ),
ensure_chain ('nat' , $zones{$sourcezone}{type} eq 'firewall' ? 'OUTPUT' : dnat_chain $sourcezone ),
PREROUTE_RESTRICT , PREROUTE_RESTRICT ,
$rule , $rule ,
$source , $source ,
@ -1050,7 +1051,7 @@ sub process_rule1 ( $$$$$$$$$$ ) {
$target , $target ,
$loglevel , $loglevel ,
$action , $action ,
$serverport ? do_proto( $proto, '', '' ) : ''; $serverport ? do_proto( $proto, '', '' ) : '' );
# #
# After NAT: # After NAT:
# - the destination port will be the server port # - the destination port will be the server port
@ -1078,8 +1079,7 @@ sub process_rule1 ( $$$$$$$$$$ ) {
$origdest = $interfaces ? "detect:$interfaces" : ALLIPv4; $origdest = $interfaces ? "detect:$interfaces" : ALLIPv4;
} }
expand_rule expand_rule( ensure_chain ('nat' , $zones{$sourcezone}{type} eq 'firewall' ? 'OUTPUT' : dnat_chain $sourcezone) ,
ensure_chain ('nat' , $zones{$sourcezone}{type} eq 'firewall' ? 'OUTPUT' : dnat_chain $sourcezone) ,
PREROUTE_RESTRICT , PREROUTE_RESTRICT ,
$rule , $rule ,
$source , $source ,
@ -1088,7 +1088,7 @@ sub process_rule1 ( $$$$$$$$$$ ) {
'-j RETURN ' , '-j RETURN ' ,
$loglevel , $loglevel ,
$action , $action ,
''; '' );
} }
} }
# #
@ -1107,8 +1107,7 @@ sub process_rule1 ( $$$$$$$$$$ ) {
$origdest = ''; $origdest = '';
} }
expand_rule expand_rule( ensure_chain ('filter', $chain ) ,
ensure_chain ('filter', $chain ) ,
$restriction , $restriction ,
$rule , $rule ,
$source , $source ,
@ -1117,7 +1116,7 @@ sub process_rule1 ( $$$$$$$$$$ ) {
"-j $action " , "-j $action " ,
$loglevel , $loglevel ,
$action , $action ,
''; '' );
} }
} }