From 2b62ed430fe6d8f0301486232832910ee14b08f3 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sun, 13 Nov 2016 17:56:19 +0100
Subject: [PATCH] (tinc) probe networks using model instead of raw config

---
 .../src/etc/inc/plugins.inc.d/if_tinc.inc     | 46 +++++++------------
 1 file changed, 16 insertions(+), 30 deletions(-)

diff --git a/net/tinc/src/etc/inc/plugins.inc.d/if_tinc.inc b/net/tinc/src/etc/inc/plugins.inc.d/if_tinc.inc
index e52d4abde..f82abda22 100644
--- a/net/tinc/src/etc/inc/plugins.inc.d/if_tinc.inc
+++ b/net/tinc/src/etc/inc/plugins.inc.d/if_tinc.inc
@@ -44,17 +44,11 @@ function if_tinc_services()
 
     $services = array();
     $is_enabled = false;
-    if (isset($config['OPNsense']['Tinc']['networks']['network'])) {
-        if (!isset($config['OPNsense']['Tinc']['networks']['network'][0])) {
-            $networks = array($config['OPNsense']['Tinc']['networks']['network']);
-        } else {
-            $networks = $config['OPNsense']['Tinc']['networks']['network'];
-        }
-        foreach ($networks as $network) {
-            if (!empty($network['enabled'])) {
-                $is_enabled = true;
-                break;
-            }
+    $mdl = new \OPNsense\Tinc\Tinc();
+    foreach ($mdl->networks->network->__items as $network) {
+        if ($network->enabled == "1") {
+            $is_enabled = true;
+            break;
         }
     }
 
@@ -78,26 +72,18 @@ function if_tinc_interfaces()
     global $config;
 
     $interfaces = array();
-
-    if (isset($config['OPNsense']['Tinc']['networks']['network'])) {
-        if (!isset($config['OPNsense']['Tinc']['networks']['network'][0])) {
-            $networks = array($config['OPNsense']['Tinc']['networks']['network']);
-        } else {
-            $networks = $config['OPNsense']['Tinc']['networks']['network'];
-        }
-        foreach ($networks as $network) {
-            if (!empty($network['enabled'])) {
-                $oic = array('enable' => true);
-                $oic['if'] = 'tinc';
-                $oic['descr'] = 'TincVPN';
-                $oic['type'] = 'none';
-                $oic['virtual'] = true;
-                $oic['networks'] = array();
-                $interfaces['tinc'] = $oic;
-                break;
-            }
+    $mdl = new \OPNsense\Tinc\Tinc();
+    foreach ($mdl->networks->network->__items as $network) {
+        if ($network->enabled == "1") {
+            $oic = array('enable' => true);
+            $oic['if'] = 'tinc';
+            $oic['descr'] = 'TincVPN';
+            $oic['type'] = 'none';
+            $oic['virtual'] = true;
+            $oic['networks'] = array();
+            $interfaces['tinc'] = $oic;
+            break;
         }
     }
-
     return $interfaces;
 }