lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

filter, cleanup unused

Browse Source
This commit is contained in:
Ad Schellevis 2016-05-26 18:22:47 +02:00
parent 6e7f8e50c9
commit bea8ddc316
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/etc/inc/filter.inc
View File

@ -883,11 +883,6 @@ function filter_generate_optcfg_array()
$oic['descr'] = !empty($ifdetail['descr']) ? $ifdetail['descr'] : $if;
$oic['sa'] = gen_subnet($oic['ip'], $oic['sn']);
$oic['sav6'] = gen_subnetv6($oic['ipv6'], $oic['snv6']);
if (isset($ifdetail['nonat'])) {
$oic['nonat'] = $ifdetail['nonat'];
} else {
$oic['nonat'] = null;
}
if (isset($ifdetail['alias-address'])) {
$oic['alias-address'] = $ifdetail['alias-address'];
} else {
@ -908,7 +903,6 @@ function filter_generate_optcfg_array()
} else {
$oic['gatewayv6'] = null;
}
$oic['spoofcheck'] = "yes";
$oic['bridge'] = link_interface_to_bridge($if);
$vips = link_interface_to_vips($if);
if (!empty($vips)) {
@ -1238,9 +1232,6 @@ function filter_nat_rules_outbound_automatic(&$FilterIflist, $src)
$natent['destination']['any'] = true;
$natent['natport'] = '';
$natent['descr'] = gettext('Auto created rule');
if (isset($ifcfg['nonat'])) {
$natent['nonat'] = true;
}
$rules[] = $natent;
}
@ -2636,7 +2627,7 @@ EOD;
}
}
if ($oc['ip'] && !($isbridged) && isset($oc['spoofcheck'])) {
if ($oc['ip'] && !($isbridged) && !isset($oc['internal_dynamic'])) {
$ipfrules .= filter_rules_spoofcheck_generate($on, $oc, $log);
}