From 85329069be8fda10412be2f730a1b04a522671e9 Mon Sep 17 00:00:00 2001
From: Maurice Walker <maurice@walker.earth>
Date: Wed, 20 May 2020 10:48:11 +0200
Subject: [PATCH] net/tayga, register virtual interface (#1826)

---
 net/tayga/Makefile                               |  4 ++--
 net/tayga/pkg-descr                              |  4 ++++
 net/tayga/src/etc/inc/plugins.inc.d/tayga.inc    | 16 ++++++++++++++++
 .../mvc/app/models/OPNsense/Tayga/General.xml    |  2 +-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/net/tayga/Makefile b/net/tayga/Makefile
index b499deb84..694549832 100644
--- a/net/tayga/Makefile
+++ b/net/tayga/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		tayga
-PLUGIN_VERSION=		1.0
-PLUGIN_COMMENT=		Tayga IPv6 64NAT
+PLUGIN_VERSION=		1.1
+PLUGIN_COMMENT=		Tayga NAT64
 PLUGIN_DEPENDS=		tayga
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
 
diff --git a/net/tayga/pkg-descr b/net/tayga/pkg-descr
index 712b410c6..0ba5d319c 100644
--- a/net/tayga/pkg-descr
+++ b/net/tayga/pkg-descr
@@ -7,6 +7,10 @@ networks where dedicated NAT64 hardware would be overkill.
 Plugin Changelog
 ================
 
+1.1
+
+* Register Tayga virtual interface
+
 1.0
 
 * Support for IPv6 prefix and IPv4 pool
diff --git a/net/tayga/src/etc/inc/plugins.inc.d/tayga.inc b/net/tayga/src/etc/inc/plugins.inc.d/tayga.inc
index 9938b03cf..88f8e5bcd 100644
--- a/net/tayga/src/etc/inc/plugins.inc.d/tayga.inc
+++ b/net/tayga/src/etc/inc/plugins.inc.d/tayga.inc
@@ -61,3 +61,19 @@ function tayga_xmlrpc_sync()
     $result['description'] = gettext('Tayga');
     return array($result);
 }
+
+function tayga_interfaces()
+{
+    $interfaces = array();
+    if (!tayga_enabled()) {
+        return $interfaces;
+    }
+    $oic = array('enable' => true);
+    $oic['if'] = 'nat64';
+    $oic['descr'] = 'Tayga';
+    $oic['type'] = 'none';
+    $oic['virtual'] = true;
+    $oic['networks'] = array();
+    $interfaces['tayga'] = $oic;
+    return $interfaces;
+}
diff --git a/net/tayga/src/opnsense/mvc/app/models/OPNsense/Tayga/General.xml b/net/tayga/src/opnsense/mvc/app/models/OPNsense/Tayga/General.xml
index 8ce7919d6..63680a3db 100644
--- a/net/tayga/src/opnsense/mvc/app/models/OPNsense/Tayga/General.xml
+++ b/net/tayga/src/opnsense/mvc/app/models/OPNsense/Tayga/General.xml
@@ -23,7 +23,7 @@
             <Required>Y</Required>
         </v6destination>
         <v6prefix type="NetworkField">
-            <default>2001:db8:1:ffff::/96</default>
+            <default>64:ff9b::/96</default>
             <Required>Y</Required>
         </v6prefix>
         <v4pool type="NetworkField">