From b0bcd62e58b0919fc0f4cdd00d378ec3a64a480d Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Fri, 27 May 2016 14:46:08 +0200
Subject: [PATCH] (plugins, vpn) ditch pppoe side affect

---
 src/etc/inc/filter.inc            | 13 -------------
 src/etc/inc/plugins.inc.d/vpn.inc | 31 ++++++++++++-------------------
 2 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc
index c36a55d1c..66cb94c8f 100644
--- a/src/etc/inc/filter.inc
+++ b/src/etc/inc/filter.inc
@@ -758,19 +758,6 @@ function filter_get_vpns_list() {
             }
         }
     }
-    /* pppoe */
-    if (isset($config['pppoes']['pppoe']) && is_array($config['pppoes']['pppoe'])) {
-        foreach($config['pppoes']['pppoe'] as $pppoe) {
-            if ($pppoe['mode'] == "server") {
-                if (is_ipaddr($pppoe['remoteip'])) {
-                    $pppoesub = gen_subnet($pppoe['remoteip'], $pppoe['pppoe_subnet']);
-                    if (is_subnet($pppoesub)) {
-                        $vpns_arr[] = $pppoesub;
-                    }
-                }
-            }
-        }
-    }
 
     if (!empty($vpns_arr)) {
         $vpns = implode(" ", $vpns_arr);
diff --git a/src/etc/inc/plugins.inc.d/vpn.inc b/src/etc/inc/plugins.inc.d/vpn.inc
index b6b4e17d8..d6221a2e8 100644
--- a/src/etc/inc/plugins.inc.d/vpn.inc
+++ b/src/etc/inc/plugins.inc.d/vpn.inc
@@ -699,28 +699,21 @@ function vpn_interface()
         $pppoeifs = array('networks' => array());
         foreach($config['pppoes']['pppoe'] as $pppoe) {
             if ($pppoe['mode'] == "server") {
-                $oic = array();
-                $oic['sa'] = $pppoe['remoteip'];
-                if ($pppoe['pppoe_subnet'] <> "") {
-                    $oic['sn'] = $pppoe['pppoe_subnet'];
-                } else {
-                    $oic['sn'] = "32";
+                if (count($pppoeifs['networks'])) {
+                    $pppoeifs = array();
+                    $pppoeifs['enable'] = true;
+                    $pppoeifs['if'] = 'pppoe';
+                    $pppoeifs['descr'] = 'pppoe';
+                    $pppoeifs['ip'] = "";
+                    $pppoeifs['sa'] = "";
+                    $pppoeifs['sn'] = "32";
+                    $pppoeifs['mode'] = "";
+                    $pppoeifs['virtual'] = true;
+                    $interfaces['pppoe'] = $pppoeifs;
+                    break;
                 }
-                $oic['ip'] = $pppoe['localip'];
-                $pppoeifs['networks'][] = $oic;
             }
         }
-        if (count($pppoeifs['networks'])) {
-            $pppoeifs['enable'] = true;
-            $pppoeifs['if'] = 'pppoe';
-            $pppoeifs['descr'] = 'pppoe';
-            $pppoeifs['ip'] = "";
-            $pppoeifs['sa'] = "";
-            $pppoeifs['sn'] = "32";
-            $pppoeifs['mode'] = "";
-            $pppoeifs['virtual'] = true;
-            $interfaces['pppoe'] = $pppoeifs;
-        }
     }
 
     return $interfaces;