Commit bea8ddc3 authored by Ad Schellevis's avatar Ad Schellevis

filter, cleanup unused

parent 6e7f8e50
...@@ -883,11 +883,6 @@ function filter_generate_optcfg_array() ...@@ -883,11 +883,6 @@ function filter_generate_optcfg_array()
$oic['descr'] = !empty($ifdetail['descr']) ? $ifdetail['descr'] : $if; $oic['descr'] = !empty($ifdetail['descr']) ? $ifdetail['descr'] : $if;
$oic['sa'] = gen_subnet($oic['ip'], $oic['sn']); $oic['sa'] = gen_subnet($oic['ip'], $oic['sn']);
$oic['sav6'] = gen_subnetv6($oic['ipv6'], $oic['snv6']); $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'])) { if (isset($ifdetail['alias-address'])) {
$oic['alias-address'] = $ifdetail['alias-address']; $oic['alias-address'] = $ifdetail['alias-address'];
} else { } else {
...@@ -908,7 +903,6 @@ function filter_generate_optcfg_array() ...@@ -908,7 +903,6 @@ function filter_generate_optcfg_array()
} else { } else {
$oic['gatewayv6'] = null; $oic['gatewayv6'] = null;
} }
$oic['spoofcheck'] = "yes";
$oic['bridge'] = link_interface_to_bridge($if); $oic['bridge'] = link_interface_to_bridge($if);
$vips = link_interface_to_vips($if); $vips = link_interface_to_vips($if);
if (!empty($vips)) { if (!empty($vips)) {
...@@ -1238,9 +1232,6 @@ function filter_nat_rules_outbound_automatic(&$FilterIflist, $src) ...@@ -1238,9 +1232,6 @@ function filter_nat_rules_outbound_automatic(&$FilterIflist, $src)
$natent['destination']['any'] = true; $natent['destination']['any'] = true;
$natent['natport'] = ''; $natent['natport'] = '';
$natent['descr'] = gettext('Auto created rule'); $natent['descr'] = gettext('Auto created rule');
if (isset($ifcfg['nonat'])) {
$natent['nonat'] = true;
}
$rules[] = $natent; $rules[] = $natent;
} }
...@@ -2636,7 +2627,7 @@ EOD; ...@@ -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); $ipfrules .= filter_rules_spoofcheck_generate($on, $oc, $log);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment