mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moving reflection's interface listing code to its own function, for use in future NAT reflection improvements.

Browse Source
This commit is contained in:
Erik Fonnesbeck 2010-05-02 04:21:24 -06:00
parent 414e21e0a2
commit 4818f161e4
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
etc/inc/filter.inc
View File

@ -772,7 +772,26 @@ function filter_flush_state_table() {
return mwexec("/sbin/pfctl -F state");
}
function filter_generate_reflection($rule, $nordr, $srcaddr, $dstport, &$starting_localhost_port, &$reflection_txt) {
function filter_get_reflection_interfaces($natif = "") {
global $FilterIflist;
$nat_if_list = array();
foreach ($FilterIflist as $ifent => $ifname) {
if($ifname['if'] == $natif)
continue;
/* Do not add reflection redirects for interfaces with gateways */
if(interface_has_gateway($ifent))
continue;
$nat_if_list[] = $ifname['if'];
}
return $nat_if_list;
}
function filter_generate_reflection($rule, $nordr, $rdr_ifs, $srcaddr, $dstport, &$starting_localhost_port, &$reflection_txt) {
global $FilterIflist, $config;
// Initialize natrules holder string
@ -785,21 +804,16 @@ function filter_generate_reflection($rule, $nordr, $srcaddr, $dstport, &$startin
else
$reflectiontimeout = "2000";
update_filter_reload_status("Setting up NAT Reflection");
update_filter_reload_status("Creating reflection rule for {$rule['descr']}...");
$natrules .= "\n# Reflection redirects\n";
$rdr_if_list = "";
foreach ($FilterIflist as $ifent => $ifname) {
/* do not process interfaces with gateways*/
if(interface_has_gateway($ifent))
continue;
if(empty($rdr_ifs))
return "";
$rdr_if_list .= " " . $ifname['if'];
}
if (!empty($rdr_if_list))
$rdr_if_list = implode(" ", $rdr_ifs);
if(count($rdr_ifs) > 1)
$rdr_if_list = "{ {$rdr_if_list} }";
update_filter_reload_status("Creating reflection rule for {$rule['descr']}...");
$natrules .= "\n# Reflection redirects\n";
if($dstport[1])
$range_end = ($dstport[1]);
@ -1252,7 +1266,7 @@ function filter_nat_rules_generate() {
$natrules .= "no nat on {$natif} proto tcp from ({$natif}) to {$rule_subnet}/{$rule_interface_subnet}\n";
$natrules .= "nat on {$natif} proto tcp from {$rule_subnet}/{$rule_interface_subnet} to {$target} port {$dstport[0]} -> ({$natif})\n";
}
$natrules .= filter_generate_reflection($rule, $nordr, $srcaddr, $dstport, $starting_localhost_port, $reflection_rules);
$natrules .= filter_generate_reflection($rule, $nordr, filter_get_reflection_interfaces($natif), $srcaddr, $dstport, $starting_localhost_port, $reflection_rules);
$natrules .= "\n";
foreach ($reflection_rules as $txtline)