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

Remove the old direct_networks table which is not used throughout the filter code. Instead we now create a negate_networks table which contains both vpns, directly connected networks (static routes) which should never be tagged for policy routing which breaks traffic.

Browse Source 
This fixes Ticket #1950 and needs to be MFC to 2.0 for 2.0.1

Conflicts:

	etc/inc/filter.inc
This commit is contained in:
smos 2011-10-13 20:47:09 +02:00
parent 378b298774
commit c066ea8aab
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
etc/inc/filter.inc
View File

@ -427,7 +427,7 @@ function filter_generate_scrubing() {
if (!empty($config['system']['maxmss']))
$maxmss = $config['system']['maxmss'];
$scrubrules .= "scrub in from any to <vpns> max-mss {$maxmss}\n";
$scrubrules .= "scrub in from any to <vpn_networks> max-mss {$maxmss}\n";
}
/* disable scrub option */
foreach ($FilterIflist as $scrubif => $scrubcfg) {
@ -743,6 +743,13 @@ function filter_get_direct_networks_list() {
$networks_arr[] = $subnet;
}
}
if(is_array($config['staticroutes']['route'])) {
foreach($config['staticroutes']['route'] as $netent) {
if(is_ipaddr($netent['network'])) {
$networks_arr[] = $netent['network'];
}
}
}
if(!empty($networks_arr)) {
$networks = implode(" ", $networks_arr);
}
@ -1451,9 +1458,15 @@ function filter_nat_rules_generate() {
$vpns_list = filter_get_vpns_list();
$direct_networks_list = filter_get_direct_networks_list();
if($vpns_list)
$natrules .= "table <vpns> { $vpns_list }\n";
$natrules .= "table <vpn_networks> { $vpns_list }\n";
/* add a Negate_networks table */
$natrules .= "table <negate_networks> {";
if($direct_networks_list)
$natrules .= "table <direct_networks> { $direct_networks_list }\n";
$natrules .= " $direct_networks_list ";
if($vpns_list)
$natrules .= " $vpns_list ";
$natrules .= "}\n";
/* DIAG: add ipv6 NAT, if requested */
if(isset($config['diag']['ipv6nat']['enable']) &&
@ -2033,14 +2046,14 @@ function filter_generate_user_rule($rule) {
/* exception(s) to a user rules can go here. */
/* rules with a gateway or pool should create another rule for routing to vpns */
if(($aline['route'] <> "") && (trim($aline['type']) == "pass") && strstr($dst, "any")) {
/* negate VPN/PPTP/PPPoE networks for load balancer/gateway rules */
$vpns = " to <vpns> ";
/* negate VPN/PPTP/PPPoE/Static Route networks for load balancer/gateway rules */
$negate_networks = " to <negate_networks> ";
$line .= $aline['type'] . $aline['direction'] . $aline['log'] . $aline['quick'] .
$aline['interface'] . $aline['prot'] . $aline['src'] . $aline['os'] .
$vpns . $aline['icmp-type'] . $aline['tag'] . $aline['tagged'] .
$negate_networks . $aline['icmp-type'] . $aline['tag'] . $aline['tagged'] .
$aline['dscp'] . $aline['allowopts'] . $aline['flags'] .
$aline['queue'] . $aline['dnpipe'] . $aline['schedlabel'] .
" label \"NEGATE_ROUTE: Negate policy route for vpn(s)\"\n";
" label \"NEGATE_ROUTE: Negate policy routing for vpn, static routes and direct networks\"\n";
}
/* piece together the actual user rule */