From 33c3cebdcdc50451669ecee189769b93f8570c42 Mon Sep 17 00:00:00 2001
From: chansizzle <14916599+chansizzle@users.noreply.github.com>
Date: Wed, 10 Feb 2021 14:04:40 -0700
Subject: [PATCH 1/2] Update {$mac}.cfg

---
 .../templates/provision/fanvil/x3u/{$mac}.cfg | 234 +++++++++++++-----
 1 file changed, 170 insertions(+), 64 deletions(-)

diff --git a/resources/templates/provision/fanvil/x3u/{$mac}.cfg b/resources/templates/provision/fanvil/x3u/{$mac}.cfg
index 0689edb733..489cf26b6f 100644
--- a/resources/templates/provision/fanvil/x3u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x3u/{$mac}.cfg
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--Template is optimized for firmware ver 2.2.10 and newer. Older firmware has incorrect tag names.-->
 <sysConf>
     <Version>2.0000000000</Version>
     <net>
         <WANTYPE>0</WANTYPE>
-        <WANIP></WANIP>
-        <WANSubnetMask></WANSubnetMask>
-        <WANGateway></WANGateway>
+        <WANIP>192.168.1.179</WANIP>
+        <WANSubnetMask>255.255.255.0</WANSubnetMask>
+        <WANGateway>192.168.1.1</WANGateway>
         <DomainName></DomainName>
         <PrimaryDNS>{if isset($dns_server_primary)}{$dns_server_primary}{else}9.9.9.9{/if}</PrimaryDNS>
         <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>
+
         <DHCPOption100-101>1</DHCPOption100-101>
         <UseVendorClassID>0</UseVendorClassID>
         <VendorClassID>Fanvil X3U</VendorClassID>
@@ -43,11 +44,11 @@
         <OpusPayloadType></OpusPayloadType>
         <OpusSampleRate></OpusSampleRate>
         <VAD></VAD>
-        <H264PayloadType></H264PayloadType>
         <ResvAudioBand></ResvAudioBand>
         <RTPInitialPort></RTPInitialPort>
         <RTPPortQuantity></RTPPortQuantity>
         <RTPKeepAlive></RTPKeepAlive>
+        <RTPRelay></RTPRelay>
         <RTCPCNAMEUser></RTCPCNAMEUser>
         <RTCPCNAMEHost></RTCPCNAMEHost>
         <SelectYourTone>{if isset($fanvil_country_toneset)}{$fanvil_country_toneset}{else}11{/if}</SelectYourTone>
@@ -98,22 +99,25 @@
             <RegisterUser>{$account.1.auth_id}</RegisterUser>
             <RegisterPswd>{$account.1.password}</RegisterPswd>
             <RegisterTTL>{$account.1.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.1.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.1.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.1.sip_port}</ProxyPort>
             <ProxyUser>{$account.1.auth_id}</ProxyUser>
             <ProxyPswd>{$account.1.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.1.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.1.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -147,7 +151,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.1.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.1.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -166,7 +170,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>
@@ -174,10 +178,11 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.1.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
+            <RetrieveType>0</RetrieveType>
             <HelpNo></HelpNo>
             <MSRPHelpNum></MSRPHelpNum>
             <UserIsPhone>0</UserIsPhone>
@@ -200,13 +205,14 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
             <EnableBLFList>0</EnableBLFList>
             <CallerIdType>4</CallerIdType>
+            <KeepHigherCallerID>0</KeepHigherCallerID>
             <SynClockTime>0</SynClockTime>
             <MohServer></MohServer>
             <UseVPN>1</UseVPN>
@@ -223,7 +229,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -245,6 +251,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="2">
             <PhoneNumber>{$account.2.user_id}</PhoneNumber>
@@ -255,22 +263,25 @@
             <RegisterUser>{$account.2.auth_id}</RegisterUser>
             <RegisterPswd>{$account.2.password}</RegisterPswd>
             <RegisterTTL>{$account.2.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.2.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.2.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.2.sip_port}</ProxyPort>
             <ProxyUser>{$account.2.auth_id}</ProxyUser>
             <ProxyPswd>{$account.2.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.2.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.2.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -304,7 +315,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.2.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.2.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -323,7 +334,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>
@@ -331,10 +342,11 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.2.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
+            <RetrieveType>0</RetrieveType>
             <HelpNo></HelpNo>
             <MSRPHelpNum></MSRPHelpNum>
             <UserIsPhone>0</UserIsPhone>
@@ -357,13 +369,14 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
             <EnableBLFList>0</EnableBLFList>
             <CallerIdType>4</CallerIdType>
+            <KeepHigherCallerID>0</KeepHigherCallerID>
             <SynClockTime>0</SynClockTime>
             <MohServer></MohServer>
             <UseVPN>1</UseVPN>
@@ -380,7 +393,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -402,6 +415,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="3">
             <PhoneNumber>{$account.3.user_id}</PhoneNumber>
@@ -412,22 +427,25 @@
             <RegisterUser>{$account.3.auth_id}</RegisterUser>
             <RegisterPswd>{$account.3.password}</RegisterPswd>
             <RegisterTTL>{$account.3.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.3.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.3.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.3.sip_port}</ProxyPort>
             <ProxyUser>{$account.3.auth_id}</ProxyUser>
             <ProxyPswd>{$account.3.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.3.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.3.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -461,7 +479,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.3.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.3.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -480,7 +498,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>
@@ -488,10 +506,11 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.3.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
+            <RetrieveType>0</RetrieveType>
             <HelpNo></HelpNo>
             <MSRPHelpNum></MSRPHelpNum>
             <UserIsPhone>0</UserIsPhone>
@@ -514,13 +533,14 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
             <EnableBLFList>0</EnableBLFList>
             <CallerIdType>4</CallerIdType>
+            <KeepHigherCallerID>0</KeepHigherCallerID>
             <SynClockTime>0</SynClockTime>
             <MohServer></MohServer>
             <UseVPN>1</UseVPN>
@@ -537,7 +557,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -559,6 +579,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="4">
             <PhoneNumber>{$account.4.user_id}</PhoneNumber>
@@ -569,22 +591,25 @@
             <RegisterUser>{$account.4.auth_id}</RegisterUser>
             <RegisterPswd>{$account.4.password}</RegisterPswd>
             <RegisterTTL>{$account.4.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.4.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.4.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.4.sip_port}</ProxyPort>
             <ProxyUser>{$account.4.auth_id}</ProxyUser>
             <ProxyPswd>{$account.4.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.4.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.4.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -618,7 +643,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.4.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.4.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -637,7 +662,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>
@@ -645,10 +670,11 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.4.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
+            <RetrieveType>0</RetrieveType>
             <HelpNo></HelpNo>
             <MSRPHelpNum></MSRPHelpNum>
             <UserIsPhone>0</UserIsPhone>
@@ -671,13 +697,14 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
             <EnableBLFList>0</EnableBLFList>
             <CallerIdType>4</CallerIdType>
+            <KeepHigherCallerID>0</KeepHigherCallerID>
             <SynClockTime>0</SynClockTime>
             <MohServer></MohServer>
             <UseVPN>1</UseVPN>
@@ -694,7 +721,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -716,6 +743,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="5">
             <PhoneNumber>{$account.5.user_id}</PhoneNumber>
@@ -726,22 +755,25 @@
             <RegisterUser>{$account.5.auth_id}</RegisterUser>
             <RegisterPswd>{$account.5.password}</RegisterPswd>
             <RegisterTTL>{$account.5.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.5.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.5.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.5.sip_port}</ProxyPort>
             <ProxyUser>{$account.5.auth_id}</ProxyUser>
             <ProxyPswd>{$account.5.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.5.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.5.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -775,15 +807,15 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.5.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.5.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.5.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.5.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -794,7 +826,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>
@@ -802,10 +834,11 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.5.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
+            <RetrieveType>0</RetrieveType>
             <HelpNo></HelpNo>
             <MSRPHelpNum></MSRPHelpNum>
             <UserIsPhone>0</UserIsPhone>
@@ -828,13 +861,14 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
             <EnableBLFList>0</EnableBLFList>
             <CallerIdType>4</CallerIdType>
+            <KeepHigherCallerID>0</KeepHigherCallerID>
             <SynClockTime>0</SynClockTime>
             <MohServer></MohServer>
             <UseVPN>1</UseVPN>
@@ -851,7 +885,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -873,6 +907,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="6">
             <PhoneNumber>{$account.6.user_id}</PhoneNumber>
@@ -883,22 +919,25 @@
             <RegisterUser>{$account.6.auth_id}</RegisterUser>
             <RegisterPswd>{$account.6.password}</RegisterPswd>
             <RegisterTTL>{$account.6.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.6.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.6.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.6.sip_port}</ProxyPort>
             <ProxyUser>{$account.6.auth_id}</ProxyUser>
             <ProxyPswd>{$account.6.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.6.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.6.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.6.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -932,15 +971,15 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.6.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.6.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.6.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.6.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -951,7 +990,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>
@@ -959,10 +998,11 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.6.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
+            <RetrieveType>0</RetrieveType>
             <HelpNo></HelpNo>
             <MSRPHelpNum></MSRPHelpNum>
             <UserIsPhone>0</UserIsPhone>
@@ -985,13 +1025,14 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
             <EnableBLFList>0</EnableBLFList>
             <CallerIdType>4</CallerIdType>
+            <KeepHigherCallerID>0</KeepHigherCallerID>
             <SynClockTime>0</SynClockTime>
             <MohServer></MohServer>
             <UseVPN>1</UseVPN>
@@ -1008,7 +1049,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1030,17 +1071,22 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <p2p>
             <SIPP2PEnableAutoAnswer>0</SIPP2PEnableAutoAnswer>
             <SIPP2PAutoAnswerDelay>30</SIPP2PAutoAnswerDelay>
             <SIPP2PDtmfMode>1</SIPP2PDtmfMode>
             <SIPP2PSipInfoDtmfMode>0</SIPP2PSipInfoDtmfMode>
+            <SIPP2PEnablePreview>0</SIPP2PEnablePreview>
+            <SIPP2PPreviewMode>0</SIPP2PPreviewMode>
+            <SIPP2PUseVPN>1</SIPP2PUseVPN>
         </p2p>
     </sip>
     <call>
         <port index="1">
-            <EnableXferDPlan></EnableXferDPlan>
+            <EnableXferDPlan>1</EnableXferDPlan>
             <EnableFwdDPlan>0</EnableFwdDPlan>
             <EnablePreDPlan>0</EnablePreDPlan>
             <IPDialPrefix>.</IPDialPrefix>
@@ -1085,7 +1131,7 @@
             <AllowIPCall>1</AllowIPCall>
             <CallerNameType>0</CallerNameType>
             <MuteForRing>0</MuteForRing>
-            <AutoHandleVideo>0</AutoHandleVideo>
+            <AutoHandleVideo>1</AutoHandleVideo>
             <DefaultAnsMode>{$fanvil_default_answer_mode}</DefaultAnsMode>
             <DefaultDialMode>{$fanvil_default_dial_mode}</DefaultDialMode>
             <HoldToTransfer>0</HoldToTransfer>
@@ -1109,6 +1155,10 @@
             <ConfDTMFCode></ConfDTMFCode>
             <DisableDialSearch>0</DisableDialSearch>
             <CallNumberFilter></CallNumberFilter>
+            <AutoResumeCurrent>0</AutoResumeCurrent>
+            <AlertTimeout>120</AlertTimeout>
+            <RingTimeout>120</RingTimeout>
+            <RingPriority>0</RingPriority>
         </port>
         <basic>
             <DialbyPound>1</DialbyPound>
@@ -1189,13 +1239,17 @@
         <CallLogDisplayType>0</CallLogDisplayType>
         <EnableRecvSMS>1</EnableRecvSMS>
         <EnableCallHistory>1</EnableCallHistory>
-        <LineDisplayFormat>$name@$protocol$instance</LineDisplayFormat>
+        <LineDisplayFormat>$name</LineDisplayFormat>
         <EnableMWITone>0</EnableMWITone>
         <AllPswdEncryption>0</AllPswdEncryption>
         <SIPNotifyXML>1</SIPNotifyXML>
         <BlockXMLWhenCall>1</BlockXMLWhenCall>
         <XMLUpdateInterval>30</XMLUpdateInterval>
         <VqmDisplayOrder></VqmDisplayOrder>
+        <EnablePushXMLAuth>0</EnablePushXMLAuth>
+        <PickupVisualAlert>0</PickupVisualAlert>
+        <PickupAudioAlert>0</PickupAudioAlert>
+        <PickupRingType></PickupRingType>
         <display>
             <LCDTitle>{$fanvil_greeting}</LCDTitle>
             <LCDConstrast>5</LCDConstrast>
@@ -1216,6 +1270,7 @@
             <Hold>0</Hold>
             <Mute>0</Mute>
             <MissedCall>3</MissedCall>
+            <PowserSaving>1</PowserSaving>
         </powerLed>
         <lineLed>
             <LineIdleColor>0</LineIdleColor>
@@ -1224,25 +1279,36 @@
         <blfLed>
             <BLFIdleColor>0</BLFIdleColor>
             <BLFIdleCtl>1</BLFIdleCtl>
+            <BLFIdleText>terminated</BLFIdleText>
             <BLFRingColor>1</BLFRingColor>
             <BLFRingCtl>2</BLFRingCtl>
-            <BLFUsingColor>1</BLFUsingColor>
-            <BLFUsingCtl>1</BLFUsingCtl>
+            <BLFRingText>early</BLFRingText>
+            <BLFDialingColor>1</BLFDialingColor>
+            <BLFDialingCtl>0</BLFDialingCtl>
+            <BLFDialingText></BLFDialingText>
+            <BLFTalkingColor>1</BLFTalkingColor>
+            <BLFTalkingCtl>1</BLFTalkingCtl>
+            <BLFTalkingText>confirmed</BLFTalkingText>
+            <BLFHoldColor>1</BLFHoldColor>
+            <BLFHoldCtl>0</BLFHoldCtl>
+            <BLFHoldText></BLFHoldText>
             <BLFFailedColor>0</BLFFailedColor>
             <BLFFailedCtl>0</BLFFailedCtl>
+            <BLFFailedText>failed</BLFFailedText>
             <BLFParkedColor>0</BLFParkedColor>
             <BLFParkedCtl>3</BLFParkedCtl>
+            <BLFParkedText>parked</BLFParkedText>
         </blfLed>
         <volume>
-            <HandsetVol></HandsetVol>
-            <HandsetMicVol></HandsetMicVol>
-            <HeadsetVol></HeadsetVol>
-            <HeadsetMicVol></HeadsetMicVol>
-            <HeadsetRingVol></HeadsetRingVol>
-            <HandFreeVol></HandFreeVol>
-            <HandFreeMicVol></HandFreeMicVol>
-            <HandFreeRingVol></HandFreeRingVol>
-            <RingType>{if isset($fanvil_default_ringtone)}{$fanvil_default_ringtone}{else}Type 1{/if}</RingType>
+            <HandsetVol>5</HandsetVol>
+            <HandsetMicVol>3</HandsetMicVol>
+            <HeadsetVol>5</HeadsetVol>
+            <HeadsetMicVol>3</HeadsetMicVol>
+            <HeadsetRingVol>5</HeadsetRingVol>
+            <HandFreeVol>8</HandFreeVol>
+            <HandFreeMicVol>3</HandFreeMicVol>
+            <HandFreeRingVol>4</HandFreeRingVol>
+            <RingType>{if isset($fanvil_default_ringtone)}{$fanvil_default_ringtone}{else}Type 2{/if}</RingType>
         </volume>
         <date>
             <EnableSNTP>{if isset($fanvil_enable_sntp)}{$fanvil_enable_sntp}{else}1{/if}</EnableSNTP>
@@ -1274,7 +1340,7 @@
         </timeDisplay>
         <softkey>
             <SoftkeyMode>0</SoftkeyMode>
-            <SoftKeyExitStyle>{if isset($fanvil_softkey_exit)}{$fanvil_softkey_exit}{else}2{/if}</SoftKeyExitStyle>
+             <SoftKeyExitStyle>{if isset($fanvil_softkey_exit)}{$fanvil_softkey_exit}{else}2{/if}</SoftKeyExitStyle>
             <DesktopSoftkey>{if isset($fanvil_softkey_desktopsoftkey)}{$fanvil_softkey_desktopsoftkey}{else}history;contact;dnd;menu;{/if}</DesktopSoftkey>
             <TalkingSoftkey>{if isset($fanvil_softkey_talkingsoftkey)}{$fanvil_softkey_talkingsoftkey}{else}hold;xfer;conf;end;{/if}</TalkingSoftkey>
             <RingingSoftkey>{if isset($fanvil_softkey_ringingsoftkey)}{$fanvil_softkey_ringingsoftkey}{else}accept;none;forward;reject;{/if}</RingingSoftkey>
@@ -1289,6 +1355,7 @@
             <DialerCfwdSoftkey>send;2aB;delete;exit;</DialerCfwdSoftkey>
             <DesktopClick>{if isset($fanvil_softkey_desktopclick)}{$fanvil_softkey_desktopclick}{else}history;status;none;none;none;{/if}</DesktopClick>
             <DailerClick>pline;nline;none;none;none;</DailerClick>
+            <RingingClick>none;none;none;none;none;</RingingClick>
             <CallClick>none;none;none;none;none;</CallClick>
             <DesktopLongPress>status;none;none;none;reset;</DesktopLongPress>
             <DialerConfSoftkey>contact;clogs;redial;video;cancel;</DialerConfSoftkey>
@@ -1529,6 +1596,8 @@
     <dm>
         <OnhookTime>120</OnhookTime>
         <EnableHookflash>0</EnableHookflash>
+        <KeyLongPressTime>2</KeyLongPressTime>
+        <KeyLongLongPressTime>6</KeyLongLongPressTime>
     </dm>
     <vqm>
         <SessionReport>1</SessionReport>
@@ -1544,6 +1613,7 @@
     <cti>
         <EnabledActiveUri>1</EnabledActiveUri>
         <EnabledActionUrl>1</EnabledActionUrl>
+        <ActionUrlType>0</ActionUrlType>
         <ActiveUriIP></ActiveUriIP>
         <StartRebootUrl></StartRebootUrl>
         <BootCompletedUrl></BootCompletedUrl>
@@ -1554,6 +1624,8 @@
         <PhoneStateIdleUrl></PhoneStateIdleUrl>
         <PhoneStateTalking></PhoneStateTalking>
         <PhoneStateRinging></PhoneStateRinging>
+        <OnhookUri></OnhookUri>
+        <OffhookUrl></OffhookUrl>
         <DNDOnUrl></DNDOnUrl>
         <DNDOffUrl></DNDOffUrl>
         <AlwaysFWDOnUrl></AlwaysFWDOnUrl>
@@ -1578,6 +1650,7 @@
         <NewMissedcallUrl></NewMissedcallUrl>
         <NewMWIUrl></NewMWIUrl>
         <NewSMSUrl></NewSMSUrl>
+        <WebAuthChangedUrl></WebAuthChangedUrl>
         <at></at>
     </cti>
     <ateTest>
@@ -1649,6 +1722,9 @@
             <Port>0</Port>
             <Channel>0</Channel>
         </addr>
+        <dynamic>
+            <AutoExitExpires>60</AutoExitExpires>
+        </dynamic>
     </mcast>
     <dsskey>
         <SelectDsskeyAction>0</SelectDsskeyAction>
@@ -1656,10 +1732,12 @@
         <FuncKeyPageNum>1</FuncKeyPageNum>
         <SideKeyPageNum>1</SideKeyPageNum>
         <DSSHomePage>0</DSSHomePage>
+        <DisplayParkedInfo>0</DisplayParkedInfo>
         <DSSDIALSwitchMode>0</DSSDIALSwitchMode>
         <FirstCallWaitTime>16</FirstCallWaitTime>
         <FirstNumStartTime>360</FirstNumStartTime>
         <FirstNumEndTime>1080</FirstNumEndTime>
+        <DSSLongPressAction>1</DSSLongPressAction>
         <Extern1PageBelong>0</Extern1PageBelong>
         <Extern2PageBelong>0</Extern2PageBelong>
         <Extern3PageBelong>0</Extern3PageBelong>
@@ -1725,7 +1803,7 @@
     </log>
     <tr069>
         <TR069Tone>1</TR069Tone>
-        <CPESerialNumber>00100400FV02001000000c383e3aaf78</CPESerialNumber>
+        <CPESerialNumber></CPESerialNumber>
         <ACSServerType>1</ACSServerType>
         <EnableTR069>0</EnableTR069>
         <ACSURL>0.0.0.0</ACSURL>
@@ -1737,12 +1815,14 @@
         <CPEUserName>dps</CPEUserName>
         <CPEPassword>dps</CPEPassword>
         <PeriodixInterval>3600</PeriodixInterval>
-        <TLSVersion>2</TLSVersion>
+        <TLSVersion>0</TLSVersion>
         <AreaCode>020</AreaCode>
         <STUNEnable>0</STUNEnable>
         <STUNServerAddr>{$fanvil_stun_server}</STUNServerAddr>
         <STUNServerPort>{$fanvil_stun_port}</STUNServerPort>
         <STUNLocalPort>30000</STUNLocalPort>
+        <STUNMaxPeriod>30</STUNMaxPeriod>
+        <STUNMinPeriod>30</STUNMinPeriod>
     </tr069>
     <hotspot>
         <EnableHotspot>0</EnableHotspot>
@@ -1751,23 +1831,32 @@
         <ListenIP>224.0.2.0</ListenIP>
         <ListenPort>16360</ListenPort>
         <OwnName>SIP Hotspot</OwnName>
+        <RingMode>0</RingMode>
+        <EnableManageMode>0</EnableManageMode>
+        <EnableConfigMode>0</EnableConfigMode>
         <hs index="1">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
         <hs index="2">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
         <hs index="3">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
         <hs index="4">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
         <hs index="5">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
         <hs index="6">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
     </hotspot>
     <vpn>
@@ -1794,7 +1883,7 @@
         <DeviceCfgFileKey></DeviceCfgFileKey>
         <CommonCfgFileKey></CommonCfgFileKey>
         <DownloadCommonConf>1</DownloadCommonConf>
-        <SaveProvisionInfo>0</SaveProvisionInfo>
+        <SaveProvisionInfo>1</SaveProvisionInfo>
         <CheckFailTimes>5</CheckFailTimes>
         <FlashServerIP>{if isset($fanvil_provision_url)}{$fanvil_provision_url}{else}https://{$domain_name}/app/provision{/if}</FlashServerIP>
         <FlashFileName>{$fanvil_firmware_config}</FlashFileName>
@@ -1814,6 +1903,8 @@
             <DHCPOption>66</DHCPOption>
             <DHCPv6Option>0</DHCPv6Option>
             <DhcpOption120>0</DhcpOption120>
+            <SaveDHCPOpion>0</SaveDHCPOpion>
+            <DhcpRenewUpgrade>1</DhcpRenewUpgrade>
         </opt>
     </ap>
     <fwCheck>
@@ -1839,7 +1930,7 @@
         <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>
         <LLDPSaveLearnData>0</LLDPSaveLearnData>
-        <CDPEnable>0</CDPEnable>
+        <CDPEnable>1</CDPEnable>
         <CDPRefreshTime>60</CDPRefreshTime>
         <DHCPOptionVlan>132</DHCPOptionVlan>
     </qos>
@@ -1867,6 +1958,7 @@
         <ServerAddr>0.0.0.0</ServerAddr>
         <ServerPort>10000</ServerPort>
     </record>
+    <UIconfig></UIconfig>
     <background>
         <TimeoutToScreensaver>0</TimeoutToScreensaver>
         <UserChangeBackground>0</UserChangeBackground>
@@ -1878,5 +1970,19 @@
         <SMSPopup>1</SMSPopup>
         <OtherPopup>1</OtherPopup>
         <EnablePortMirror>0</EnablePortMirror>
+        <SidekeyLabelLength>0</SidekeyLabelLength>
+        <AppIconDisplay>1,1,1,1</AppIconDisplay>
+        <DisplayProvisionprompt>0</DisplayProvisionprompt>
+        <IdleTimeFontColor>0x262626</IdleTimeFontColor>
+        <CommonTitleFontColor>0xffffff</CommonTitleFontColor>
+        <SoftkeyFontColor>0xffffff</SoftkeyFontColor>
+        <MenuListFontColor>0x262626</MenuListFontColor>
+        <ScrollBarColor>0x5a9dba</ScrollBarColor>
+        <WarnThemeColor>0xc4012f</WarnThemeColor>
+        <InformThemeColor>0x007bb0</InformThemeColor>
+        <FunkeyListFontColor>0xffffff</FunkeyListFontColor>
+        <TalkingFontColor>0x262626</TalkingFontColor>
+        <DesktopTimeDisplay>1</DesktopTimeDisplay>
+        <TimeoutToPowerSaving></TimeoutToPowerSaving>
     </background>
 </sysConf>

From b77025b9babe864c6c85b44cde8183f883855dc3 Mon Sep 17 00:00:00 2001
From: chansizzle <14916599+chansizzle@users.noreply.github.com>
Date: Wed, 10 Feb 2021 14:51:34 -0700
Subject: [PATCH 2/2] Update {$mac}.cfg

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

diff --git a/resources/templates/provision/fanvil/x3u/{$mac}.cfg b/resources/templates/provision/fanvil/x3u/{$mac}.cfg
index 489cf26b6f..814c34ed11 100644
--- a/resources/templates/provision/fanvil/x3u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x3u/{$mac}.cfg
@@ -4,9 +4,9 @@
     <Version>2.0000000000</Version>
     <net>
         <WANTYPE>0</WANTYPE>
-        <WANIP>192.168.1.179</WANIP>
-        <WANSubnetMask>255.255.255.0</WANSubnetMask>
-        <WANGateway>192.168.1.1</WANGateway>
+        <WANIP></WANIP>
+        <WANSubnetMask></WANSubnetMask>
+        <WANGateway></WANGateway>
         <DomainName></DomainName>
         <PrimaryDNS>{if isset($dns_server_primary)}{$dns_server_primary}{else}9.9.9.9{/if}</PrimaryDNS>
         <SecondaryDNS>{if isset($dns_server_secondary)}{$dns_server_secondary}{else}208.67.222.222{/if}</SecondaryDNS>