Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
OpnSense
Commits
a3474575
Commit
a3474575
authored
Nov 27, 2015
by
Franco Fichtner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
filter: another one zappe, if used verbatim pass fresh output
parent
4345a674
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
filter.inc
src/etc/inc/filter.inc
+4
-3
system_general.php
src/www/system_general.php
+1
-2
No files found.
src/etc/inc/filter.inc
View file @
a3474575
...
@@ -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
]);
...
...
src/www/system_general.php
View file @
a3474575
...
@@ -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"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment