From fd151d670c9e5d92ec374bc70fdc719be2910047 Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Tue, 14 May 2019 14:00:08 -0400
Subject: [PATCH 1/2] Update {$mac}.cfg

---
 .../templates/provision/fanvil/x6/{$mac}.cfg  | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/resources/templates/provision/fanvil/x6/{$mac}.cfg b/resources/templates/provision/fanvil/x6/{$mac}.cfg
index 2547016a69..5f51a42032 100644
--- a/resources/templates/provision/fanvil/x6/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6/{$mac}.cfg
@@ -8,7 +8,7 @@
         <WANGateway></WANGateway>
         <DomainName></DomainName>
         <PrimaryDNS>{if isset($dns_server_primary)}{$dns_server_primary}{else}8.8.8.8{/if}</PrimaryDNS>
-        <SecondaryDNS>{if isset($dns_server_secondary)}{$dns_server_secondary}{else}202.96.134.133{/if}</SecondaryDNS>
+        <SecondaryDNS>{if isset($dns_server_secondary)}{$dns_server_secondary}{else}208.67.222.222{/if}</SecondaryDNS>
         <EnableDHCP>1</EnableDHCP>
         <DHCPAutoDNS>1</DHCPAutoDNS>
         <DHCPAutoTime>1</DHCPAutoTime>
@@ -162,8 +162,6 @@
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            
-            
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -172,7 +170,6 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-                                 
             
             {if $account.1.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.1.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
@@ -210,7 +207,7 @@
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -319,7 +316,6 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-                                 
            
             {if $account.2.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.2.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
@@ -466,8 +462,7 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <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}
@@ -760,8 +755,7 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <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}
@@ -906,9 +900,8 @@
             <PresenceMode>0</PresenceMode>
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
-            <SignalPort>5060</SignalPort>
-                                 
-            
+            <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}
@@ -1686,7 +1679,7 @@
         <VideoDSCP>{if isset($fanvil_dscp_rtp_video)}{$fanvil_dscp_rtp_video}{else}34{/if}</VideoDSCP>
         <LLDPTransmit>{if isset($fanvil_lldp_tx_enable)}{$fanvil_lldp_tx_enable}{else}0{/if}</LLDPTransmit>
         <LLDPRefreshTime>{if isset($fanvil_lldp_refresh)}{$fanvil_lldp_refresh}{else}60{/if}</LLDPRefreshTime>
-        <LLDPLearnPolicy>{if isset($fanvil_lldp_learn)}{$fanvil_lldp_learn}{else}0{/if}</LLDPLearnPolicy></LLDPLearnPolicy>
+        <LLDPLearnPolicy>{if isset($fanvil_lldp_learn)}{$fanvil_lldp_learn}{else}0{/if}</LLDPLearnPolicy>
         <LLDPSaveLearnData>1</LLDPSaveLearnData>
         <CDPEnable>0</CDPEnable>
         <CDPRefreshTime>60</CDPRefreshTime>

From 52ba09c54c402888bc51621b16bca557ec9ecc21 Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Tue, 14 May 2019 14:41:35 -0400
Subject: [PATCH 2/2] Update {$mac}.cfg

---
 resources/templates/provision/fanvil/x6/{$mac}.cfg | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/resources/templates/provision/fanvil/x6/{$mac}.cfg b/resources/templates/provision/fanvil/x6/{$mac}.cfg
index 5f51a42032..d231659fde 100644
--- a/resources/templates/provision/fanvil/x6/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6/{$mac}.cfg
@@ -262,7 +262,7 @@
             <ProxyUser>{$account.2.auth_id}</ProxyUser>
             <ProxyPswd>{$account.2.password}</ProxyPswd>
             <BakProxyAddr>{$account.2.outbound_proxy_secondary}</BakProxyAddr>
-            <BakProxyPort>{$account.1.sip_port}</BakProxyPort>
+            <BakProxyPort>{$account.2.sip_port}</BakProxyPort>
             <EnableFailback>{if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
@@ -466,8 +466,8 @@
             {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.1.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
-            {if $account.1.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            {if $account.3.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.3.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
@@ -613,6 +613,7 @@
            
             {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 == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
             {if $account.4.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}