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

Add static route subnets if their gateway is within the source subnet for the nat rule. Ticket #2163

Browse Source
This commit is contained in:
Erik Fonnesbeck 2012-02-04 02:30:55 -07:00
parent bf443dfe84
commit 1716682b1d
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
etc/inc/filter.inc
View File

@ -958,12 +958,17 @@ function filter_generate_reflection_nat($rule, &$route_table, $nat_ifs, $protoco
$route_table = array();
/* create a route table we can search */
exec("netstat -rnWf inet", $route_table);
foreach($route_table as $rt_key => $line) {
if(preg_match("/^[0-9]+(?:\.[0-9]+){3}\/[0-9]+[ ]+(?:[0-9]+(?:\.[0-9]+){3}|link[#])/", $line))
$route_table[$rt_key] = preg_split("/[ ]+/", $line);
else
unset($route_table[$rt_key]);
}
}
/* Search for matching subnets in the routing table */
foreach($route_table as $line) {
if(preg_match("/^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\/[0-9]+[ ]+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|link[#])/", $line)) {
$fields = preg_split("/[ ]+/", $line);
foreach($route_table as $fields) {
if(is_subnet($fields[0])) {
$subnet = $fields[0];
$subnet_split = explode("/", $subnet);
$subnet_if = $fields[6];
@ -984,6 +989,13 @@ function filter_generate_reflection_nat($rule, &$route_table, $nat_ifs, $protoco
}
}
if(!empty($ifsubnet_ip)) {
$subnets = array($subnet);
foreach($route_table as $rtentry) {
if(is_subnet($rtentry[0]) && is_ipaddr($rtentry[1]) && ip_in_subnet($rtentry[1], $subnet) && $rtentry[6] == $subnet_if)
$subnets[] = $rtentry[0];
}
if(count($subnets) > 1)
$subnet = "{ " . implode(" ", $subnets) . " }";
$natrules .= "no nat on {$subnet_if}{$protocol_text} from {$subnet_if} to {$target}\n";
$natrules .= "nat on {$subnet_if}{$protocol_text} from {$subnet} to {$target} -> {$ifsubnet_ip}{$static_port}\n";
}