Commit a3474575 authored by Franco Fichtner's avatar Franco Fichtner

filter: another one zappe, if used verbatim pass fresh output

parent 4345a674
...@@ -801,9 +801,10 @@ function filter_get_vpns_list() { ...@@ -801,9 +801,10 @@ function filter_get_vpns_list() {
/* returns space separated list of directly connected networks /* returns space separated list of directly connected networks
* optionally returns an array instead, including friendly interface and gateway (if applicable) * optionally returns an array instead, including friendly interface and gateway (if applicable)
*/ */
function filter_get_direct_networks_list($returnsubnetsonly = true) { function filter_get_direct_networks_list(&$FilterIflist, $returnsubnetsonly = true)
{
global $config, $GatewaysList; global $config, $GatewaysList;
$FilterIflist = filter_generate_optcfg_array() ;
/* build list of directly connected interfaces and networks */ /* build list of directly connected interfaces and networks */
$networks = ""; $networks = "";
$networks_arr = array(); $networks_arr = array();
...@@ -1094,7 +1095,7 @@ function filter_generate_reflection_nat(&$FilterIflist, $rule, &$route_table, $n ...@@ -1094,7 +1095,7 @@ function filter_generate_reflection_nat(&$FilterIflist, $rule, &$route_table, $n
if(!is_array($route_table)) { if(!is_array($route_table)) {
/* get a simulated IPv4-only route table based on the config */ /* get a simulated IPv4-only route table based on the config */
$route_table = filter_get_direct_networks_list(false); $route_table = filter_get_direct_networks_list($FilterIflist, false);
foreach($route_table as $rt_key => $rt_ent) { foreach($route_table as $rt_key => $rt_ent) {
if(!is_subnetv4($rt_ent['subnet'])) { if(!is_subnetv4($rt_ent['subnet'])) {
unset($route_table[$rt_key]); unset($route_table[$rt_key]);
......
...@@ -171,8 +171,7 @@ if ($_POST) { ...@@ -171,8 +171,7 @@ if ($_POST) {
} }
} }
} }
$direct_networks_list = explode(' ', filter_get_direct_networks_list(filter_generate_optcfg_array()));
$direct_networks_list = explode(" ", filter_get_direct_networks_list());
for ($dnscounter=1; $dnscounter<5; $dnscounter++) { for ($dnscounter=1; $dnscounter<5; $dnscounter++) {
$dnsitem = "dns{$dnscounter}"; $dnsitem = "dns{$dnscounter}";
$dnsgwitem = "dns{$dnscounter}gw"; $dnsgwitem = "dns{$dnscounter}gw";
......
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