Commit 3bc07e7c authored by Ad Schellevis's avatar Ad Schellevis

(filter, plugins, ppppoe) use pppoe.items for nat outbound

parent 30266056
...@@ -1150,16 +1150,16 @@ function filter_nat_rules_automatic_tonathosts(&$FilterIflist, $with_descr = fal ...@@ -1150,16 +1150,16 @@ function filter_nat_rules_automatic_tonathosts(&$FilterIflist, $with_descr = fal
} }
/* PPPoE subnet */ /* PPPoE subnet */
if (isset($FilterIflist['pppoe']['networks']) && is_array($FilterIflist['pppoe']['networks'])) if (isset($FilterIflist['pppoe']['items']) && is_array($FilterIflist['pppoe']['items']))
foreach ($FilterIflist['pppoe']['networks'] as $pppoe) { foreach ($FilterIflist['pppoe']['items'] as $pppoe) {
if (is_private_ip($pppoe['ip'])) { if (is_private_ip($pppoe['ip'])) {
$tonathosts[] = "{$pppoe['sa']}/{$pppoe['sn']}"; $tonathosts[] = "{$pppoe['sa']}/{$pppoe['sn']}";
$descriptions[] = gettext("PPPoE server"); $descriptions[] = gettext("PPPoE server");
} }
} }
/* L2TP subnet */ /* L2TP subnet */
if (isset($FilterIflist['l2tp']) && $FilterIflist['l2tp']['mode'] == "server") { if (isset($FilterIflist['l2tp']) && $FilterIflist['l2tp']['mode'] == "server") {
$l2tp_sa = $FilterIflist['l2tp']['sa']; $l2tp_sa = $FilterIflist['l2tp']['sa'];
$l2tp_sn = $FilterIflist['l2tp']['sn']; $l2tp_sn = $FilterIflist['l2tp']['sn'];
if (is_private_ip($l2tp_sa) && !empty($l2tp_sn)) { if (is_private_ip($l2tp_sa) && !empty($l2tp_sn)) {
......
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