net/tayga: bugfixes for TUN interface and Tayga IPv6 addresses (opnse…

…nse#1738)
thutex · Mar 13, 2020 · b4cb311 · b4cb311
1 parent f2baaed
commit b4cb311
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/net/tayga/src/etc/rc.d/opnsense-tayga b/net/tayga/src/etc/rc.d/opnsense-tayga
@@ -28,7 +28,7 @@ tayga_start()
         ${command} ${command_args}
         sleep 1
         ifconfig nat64 inet ${tayga_v4destination}/32 ${tayga_v4address}
-        ifconfig nat64 inet6 ${tayga_v6estination}/128
+        ifconfig nat64 inet6 ${tayga_v6destination}/128
         route -6 add ${tayga_v6prefix} -interface nat64
         route -4 add ${tayga_v4pool} -interface nat64
 }

diff --git a/net/tayga/src/opnsense/service/templates/OPNsense/Tayga/tayga b/net/tayga/src/opnsense/service/templates/OPNsense/Tayga/tayga
@@ -6,6 +6,7 @@ tayga_v4destination={{ OPNsense.tayga.general.v4destination }}
 tayga_v4pool={{ OPNsense.tayga.general.v4pool }}
 tayga_v6prefix={{ OPNsense.tayga.general.v6prefix }}
 tayga_v6address={{ OPNsense.tayga.general.v6address }}
+tayga_v6destination={{ OPNsense.tayga.general.v6destination }}
 {% else %}
 tayga_enable="NO"
 {% endif %}
diff --git a/net/tayga/src/opnsense/service/templates/OPNsense/Tayga/tayga.conf b/net/tayga/src/opnsense/service/templates/OPNsense/Tayga/tayga.conf
@@ -4,7 +4,9 @@ tun-device nat64
 data-dir /var/db/tayga
 
 ipv4-addr {{ OPNsense.tayga.general.v4address }}
+{% if helpers.exists('OPNsense.tayga.general.v6address') and OPNsense.tayga.general.v6address != '' %}
 ipv6-addr {{ OPNsense.tayga.general.v6address }}
+{% endif %}
 prefix {{ OPNsense.tayga.general.v6prefix }}
 dynamic-pool {{ OPNsense.tayga.general.v4pool }}