From cc5167386319e91704ef7dce373ad855a202fcc0 Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Tue, 10 Dec 2013 22:56:49 +0000
Subject: [PATCH] Add and update sip port, transport and sip expires on spa112
 and spa504g

---
 .../provision/cisco/spa112/{$mac}.xml         | 10 ++++----
 .../provision/cisco/spa504g/{$mac}.xml        | 24 +++++++++----------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/resources/templates/provision/cisco/spa112/{$mac}.xml b/resources/templates/provision/cisco/spa112/{$mac}.xml
index 3129a23691..b9c65addaf 100644
--- a/resources/templates/provision/cisco/spa112/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa112/{$mac}.xml
@@ -14,8 +14,9 @@
 <Line_Enable_1_>Yes</Line_Enable_1_>
 <Mailbox_ID_1_>*97</Mailbox_ID_1_>
 <Proxy_1_>{$server_address_1}</Proxy_1_>
-<SIP_Transport_1_ group="Ext_1/SIP_Settings">>{$transport_1}</SIP_Transport_1_>
-<SIP_Port_1_ group="Ext_1/SIP_Settings">{$port_1}</SIP_Port_1_>
+<SIP_Transport_1_ group="Ext_1/SIP_Settings">{$sip_transport_1}</SIP_Transport_1_>
+<SIP_Port_1_ group="Ext_1/SIP_Settings">{$sip_port_1}</SIP_Port_1_>
+<Register_Expires_1_ group="Ext_1/Proxy_and_Registration">{$register_expires_1}</Register_Expires_1_>
 <Register_1_>Yes</Register_1_>
 <Display_Name_1_>{$display_name_1}</Display_Name_1_>
 <User_ID_1_>{$user_id_1}</User_ID_1_>
@@ -27,8 +28,9 @@
 <Mailbox_ID_2_>*97</Mailbox_ID_2_>
 <Proxy_2_>{$server_address_2}</Proxy_2_>
 <Register_2_>Yes</Register_2_>
-<SIP_Transport_2_ group="Ext_1/SIP_Settings">>{$transport_2}</SIP_Transport_2_>
-<SIP_Port_2_ group="Ext_1/SIP_Settings">{$port_2}</SIP_Port_2_>
+<SIP_Transport_2_ group="Ext_1/SIP_Settings">{$sip_transport_2}</SIP_Transport_2_>
+<SIP_Port_2_ group="Ext_1/SIP_Settings">{$sip_port_2}</SIP_Port_2_>
+<Register_Expires_2_ group="Ext_2/Proxy_and_Registration">{$register_expires_2}</Register_Expires_2_>
 <Display_Name_2_>{$display_name_2}</Display_Name_2_>
 <User_ID_2_>{$user_id_2}</User_ID_2_>
 <Password_2_>{$user_password_2}</Password_2_>
diff --git a/resources/templates/provision/cisco/spa504g/{$mac}.xml b/resources/templates/provision/cisco/spa504g/{$mac}.xml
index f8389d2ef9..40a1a0fa0d 100644
--- a/resources/templates/provision/cisco/spa504g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa504g/{$mac}.xml
@@ -261,8 +261,8 @@
 <RTP_CoS_Value_1_ group="Ext_1/Network_Settings">6</RTP_CoS_Value_1_>
 <Network_Jitter_Level_1_ group="Ext_1/Network_Settings">high</Network_Jitter_Level_1_>
 <Jitter_Buffer_Adjustment_1_ group="Ext_1/Network_Settings">up and down</Jitter_Buffer_Adjustment_1_>
-<SIP_Transport_1_ group="Ext_1/SIP_Settings">UDP</SIP_Transport_1_>
-<SIP_Port_1_ group="Ext_1/SIP_Settings">5060</SIP_Port_1_>
+<SIP_Transport_1_ group="Ext_1/SIP_Settings">{$sip_transport_1}</SIP_Transport_1_>
+<SIP_Port_1_ group="Ext_1/SIP_Settings">{$sip_port_1}</SIP_Port_1_>
 <SIP_100REL_Enable_1_ group="Ext_1/SIP_Settings">No</SIP_100REL_Enable_1_>
 <EXT_SIP_Port_1_ group="Ext_1/SIP_Settings"/>
 <Auth_Resync-Reboot_1_ group="Ext_1/SIP_Settings">Yes</Auth_Resync-Reboot_1_>
@@ -296,7 +296,7 @@
 <Use_OB_Proxy_In_Dialog_1_ group="Ext_1/Proxy_and_Registration">Yes</Use_OB_Proxy_In_Dialog_1_>
 <Register_1_ group="Ext_1/Proxy_and_Registration">Yes</Register_1_>
 <Make_Call_Without_Reg_1_ group="Ext_1/Proxy_and_Registration">No</Make_Call_Without_Reg_1_>
-<Register_Expires_1_ group="Ext_1/Proxy_and_Registration">3600</Register_Expires_1_>
+<Register_Expires_1_ group="Ext_1/Proxy_and_Registration">{$register_expires_1}</Register_Expires_1_>
 <Ans_Call_Without_Reg_1_ group="Ext_1/Proxy_and_Registration">No</Ans_Call_Without_Reg_1_>
 <Use_DNS_SRV_1_ group="Ext_1/Proxy_and_Registration">No</Use_DNS_SRV_1_>
 <DNS_SRV_Auto_Prefix_1_ group="Ext_1/Proxy_and_Registration">No</DNS_SRV_Auto_Prefix_1_>
@@ -341,8 +341,8 @@
 <RTP_CoS_Value_2_ group="Ext_2/Network_Settings">6</RTP_CoS_Value_2_>
 <Network_Jitter_Level_2_ group="Ext_2/Network_Settings">high</Network_Jitter_Level_2_>
 <Jitter_Buffer_Adjustment_2_ group="Ext_2/Network_Settings">up and down</Jitter_Buffer_Adjustment_2_>
-<SIP_Transport_2_ group="Ext_2/SIP_Settings">UDP</SIP_Transport_2_>
-<SIP_Port_2_ group="Ext_2/SIP_Settings">5061</SIP_Port_2_>
+<SIP_Transport_2_ group="Ext_2/SIP_Settings">{$sip_transport_2}</SIP_Transport_2_>
+<SIP_Port_2_ group="Ext_2/SIP_Settings">{$sip_port_2}</SIP_Port_2_>
 <SIP_100REL_Enable_2_ group="Ext_2/SIP_Settings">No</SIP_100REL_Enable_2_>
 <EXT_SIP_Port_2_ group="Ext_2/SIP_Settings"/>
 <Auth_Resync-Reboot_2_ group="Ext_2/SIP_Settings">Yes</Auth_Resync-Reboot_2_>
@@ -376,7 +376,7 @@
 <Use_OB_Proxy_In_Dialog_2_ group="Ext_2/Proxy_and_Registration">Yes</Use_OB_Proxy_In_Dialog_2_>
 <Register_2_ group="Ext_2/Proxy_and_Registration">Yes</Register_2_>
 <Make_Call_Without_Reg_2_ group="Ext_2/Proxy_and_Registration">No</Make_Call_Without_Reg_2_>
-<Register_Expires_2_ group="Ext_2/Proxy_and_Registration">3600</Register_Expires_2_>
+<Register_Expires_2_ group="Ext_2/Proxy_and_Registration">{$register_expires_2}</Register_Expires_2_>
 <Ans_Call_Without_Reg_2_ group="Ext_2/Proxy_and_Registration">No</Ans_Call_Without_Reg_2_>
 <Use_DNS_SRV_2_ group="Ext_2/Proxy_and_Registration">No</Use_DNS_SRV_2_>
 <DNS_SRV_Auto_Prefix_2_ group="Ext_2/Proxy_and_Registration">No</DNS_SRV_Auto_Prefix_2_>
@@ -421,8 +421,8 @@
 <RTP_CoS_Value_3_ group="Ext_3/Network_Settings">6</RTP_CoS_Value_3_>
 <Network_Jitter_Level_3_ group="Ext_3/Network_Settings">high</Network_Jitter_Level_3_>
 <Jitter_Buffer_Adjustment_3_ group="Ext_3/Network_Settings">up and down</Jitter_Buffer_Adjustment_3_>
-<SIP_Transport_3_ group="Ext_3/SIP_Settings">UDP</SIP_Transport_3_>
-<SIP_Port_3_ group="Ext_3/SIP_Settings">5062</SIP_Port_3_>
+<SIP_Transport_3_ group="Ext_3/SIP_Settings">{$sip_transport_3}</SIP_Transport_3_>
+<SIP_Port_3_ group="Ext_3/SIP_Settings">{$sip_port_3}</SIP_Port_3_>
 <SIP_100REL_Enable_3_ group="Ext_3/SIP_Settings">No</SIP_100REL_Enable_3_>
 <EXT_SIP_Port_3_ group="Ext_3/SIP_Settings"/>
 <Auth_Resync-Reboot_3_ group="Ext_3/SIP_Settings">Yes</Auth_Resync-Reboot_3_>
@@ -456,7 +456,7 @@
 <Use_OB_Proxy_In_Dialog_3_ group="Ext_3/Proxy_and_Registration">Yes</Use_OB_Proxy_In_Dialog_3_>
 <Register_3_ group="Ext_3/Proxy_and_Registration">Yes</Register_3_>
 <Make_Call_Without_Reg_3_ group="Ext_3/Proxy_and_Registration">No</Make_Call_Without_Reg_3_>
-<Register_Expires_3_ group="Ext_3/Proxy_and_Registration">3600</Register_Expires_3_>
+<Register_Expires_3_ group="Ext_3/Proxy_and_Registration">{$register_expires_3}</Register_Expires_3_>
 <Ans_Call_Without_Reg_3_ group="Ext_3/Proxy_and_Registration">No</Ans_Call_Without_Reg_3_>
 <Use_DNS_SRV_3_ group="Ext_3/Proxy_and_Registration">No</Use_DNS_SRV_3_>
 <DNS_SRV_Auto_Prefix_3_ group="Ext_3/Proxy_and_Registration">No</DNS_SRV_Auto_Prefix_3_>
@@ -501,8 +501,8 @@
 <RTP_CoS_Value_4_ group="Ext_4/Network_Settings">6</RTP_CoS_Value_4_>
 <Network_Jitter_Level_4_ group="Ext_4/Network_Settings">high</Network_Jitter_Level_4_>
 <Jitter_Buffer_Adjustment_4_ group="Ext_4/Network_Settings">up and down</Jitter_Buffer_Adjustment_4_>
-<SIP_Transport_4_ group="Ext_4/SIP_Settings">UDP</SIP_Transport_4_>
-<SIP_Port_4_ group="Ext_4/SIP_Settings">5063</SIP_Port_4_>
+<SIP_Transport_4_ group="Ext_4/SIP_Settings">{$sip_transport_4}</SIP_Transport_4_>
+<SIP_Port_4_ group="Ext_4/SIP_Settings">{$sip_port_4}</SIP_Port_4_>
 <SIP_100REL_Enable_4_ group="Ext_4/SIP_Settings">No</SIP_100REL_Enable_4_>
 <EXT_SIP_Port_4_ group="Ext_4/SIP_Settings"/>
 <Auth_Resync-Reboot_4_ group="Ext_4/SIP_Settings">Yes</Auth_Resync-Reboot_4_>
@@ -536,7 +536,7 @@
 <Use_OB_Proxy_In_Dialog_4_ group="Ext_4/Proxy_and_Registration">Yes</Use_OB_Proxy_In_Dialog_4_>
 <Register_4_ group="Ext_4/Proxy_and_Registration">Yes</Register_4_>
 <Make_Call_Without_Reg_4_ group="Ext_4/Proxy_and_Registration">No</Make_Call_Without_Reg_4_>
-<Register_Expires_4_ group="Ext_4/Proxy_and_Registration">3600</Register_Expires_4_>
+<Register_Expires_4_ group="Ext_4/Proxy_and_Registration">{$register_expires_4}</Register_Expires_4_>
 <Ans_Call_Without_Reg_4_ group="Ext_4/Proxy_and_Registration">No</Ans_Call_Without_Reg_4_>
 <Use_DNS_SRV_4_ group="Ext_4/Proxy_and_Registration">No</Use_DNS_SRV_4_>
 <DNS_SRV_Auto_Prefix_4_ group="Ext_4/Proxy_and_Registration">No</DNS_SRV_Auto_Prefix_4_>