From 22fea7375efd59045954f5a625a769eb78d398b6 Mon Sep 17 00:00:00 2001
From: chansizzle <14916599+chansizzle@users.noreply.github.com>
Date: Thu, 19 Nov 2020 22:40:53 -0700
Subject: [PATCH] Update {$mac}.cfg

tls
side key update
---
 .../templates/provision/fanvil/x6u/{$mac}.cfg | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/resources/templates/provision/fanvil/x6u/{$mac}.cfg b/resources/templates/provision/fanvil/x6u/{$mac}.cfg
index 6bde547c52..e01b216bd7 100644
--- a/resources/templates/provision/fanvil/x6u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6u/{$mac}.cfg
@@ -211,7 +211,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.1.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.1.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.1.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.1.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -373,7 +373,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.2.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.2.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.2.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.2.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -535,7 +535,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.3.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.3.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.3.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.3.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -697,7 +697,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.4.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.4.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.4.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.4.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -859,7 +859,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.5.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.5.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.5.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.5.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -1021,7 +1021,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.6.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.6.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.6.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.6.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -1183,7 +1183,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.7.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.7.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.7.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.7.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -1345,7 +1345,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.8.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.8.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.8.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.8.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -1507,7 +1507,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.9.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.9.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.9.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.9.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -1669,7 +1669,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.10.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.10.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.10.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.10.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -1831,7 +1831,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.11.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.11.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.11.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.11.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -1993,7 +1993,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.12.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.12.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.12.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.12.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -2154,7 +2154,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.13.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.13.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.13.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.13.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -2316,7 +2316,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.14.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.14.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.14.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.14.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -2478,7 +2478,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.15.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.15.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.15.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.15.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -2640,7 +2640,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.16.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.16.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.16.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.16.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -2803,7 +2803,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.17.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.17.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.17.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.17.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -2966,7 +2966,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.18.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.18.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.18.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.18.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -3129,7 +3129,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.19.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.19.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.19.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.19.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -3292,7 +3292,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.20.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.20.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.20.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.20.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -4048,15 +4048,16 @@
         <DSSExtend4IP></DSSExtend4IP>
         <DSSExtend5MAC></DSSExtend5MAC>
         <DSSExtend5IP></DSSExtend5IP>
+        <dssSide index="1">
         {foreach $keys["line"] as $row}
-            <SidekeyConfig1 index="{$row.device_key_id}">
+            <Fkey index="{$row.device_key_id}">
                 <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
                 <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
                 <Title>{$row.device_key_label}</Title>
                 <ICON>{$row.device_key_icon}</ICON>
-            </SidekeyConfig1>
+            </Fkey>
         {/foreach}
-        
+        </dssSide>
         {strip}{*-- Each Internal Index contains 12 keys --*}{/strip}        
         <internal index="1">
             {foreach $keys["memory"] as $row}