From f0eb71950c2e6e4eb982e70f97958c42c78db4f8 Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Thu, 9 Jan 2014 02:35:29 +0000 Subject: [PATCH] Fix TLS option for the sip transport. --- .../templates/provision/yealink/t20p/{$mac}.cfg | 13 +++++++------ .../templates/provision/yealink/t22p/{$mac}.cfg | 13 +++++++------ .../templates/provision/yealink/t26p/{$mac}.cfg | 13 +++++++------ .../templates/provision/yealink/t28p/{$mac}.cfg | 13 +++++++------ .../templates/provision/yealink/t32g/{$mac}.cfg | 14 +++++++------- .../templates/provision/yealink/t38g/{$mac}.cfg | 13 +++++++------ .../templates/provision/yealink/t46g/{$mac}.cfg | 12 ++++++------ .../templates/provision/yealink/vp530/{$mac}.cfg | 8 ++++---- 8 files changed, 52 insertions(+), 47 deletions(-) diff --git a/resources/templates/provision/yealink/t20p/{$mac}.cfg b/resources/templates/provision/yealink/t20p/{$mac}.cfg index 97a09fc7da..6b91047e78 100644 --- a/resources/templates/provision/yealink/t20p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t20p/{$mac}.cfg @@ -43,9 +43,10 @@ account.1.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_1 == 'udp'}account.1.transport = 0{/if} {if $sip_transport_1 == 'tcp'}account.1.transport = 1{/if} -{if $sip_transport_1 == 'tcp'}account.1.transport = 2{/if} +{if $sip_transport_1 == 'tls'}account.1.transport = 2{/if} {if $sip_transport_1 == 'dns srv'}account.1.transport = 3{/if} + #Configure the address of the backup outbound proxy server. account.1.backup_outbound_host = @@ -352,7 +353,7 @@ account.2.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_2 == 'udp'}account.2.transport = 0{/if} {if $sip_transport_2 == 'tcp'}account.2.transport = 1{/if} -{if $sip_transport_2 == 'tcp'}account.2.transport = 2{/if} +{if $sip_transport_2 == 'tls'}account.2.transport = 2{/if} {if $sip_transport_2 == 'dns srv'}account.2.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -661,7 +662,7 @@ account.3.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_3 == 'udp'}account.3.transport = 0{/if} {if $sip_transport_3 == 'tcp'}account.3.transport = 1{/if} -{if $sip_transport_3 == 'tcp'}account.3.transport = 2{/if} +{if $sip_transport_3 == 'tls'}account.3.transport = 2{/if} {if $sip_transport_3 == 'dns srv'}account.3.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -970,7 +971,7 @@ account.4.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_4== 'udp'}account.4.transport = 0{/if} {if $sip_transport_4 == 'tcp'}account.4.transport = 1{/if} -{if $sip_transport_4 == 'tcp'}account.4.transport = 2{/if} +{if $sip_transport_4 == 'tls'}account.4.transport = 2{/if} {if $sip_transport_4 == 'dns srv'}account.4.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -1282,7 +1283,7 @@ account.5.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_5 == 'udp'}account.5.transport = 0{/if} {if $sip_transport_5 == 'tcp'}account.5.transport = 1{/if} -{if $sip_transport_5 == 'tcp'}account.5.transport = 2{/if} +{if $sip_transport_5 == 'tls'}account.5.transport = 2{/if} {if $sip_transport_5 == 'dns srv'}account.5.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -1589,7 +1590,7 @@ account.6.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_6 == 'udp'}account.6.transport = 0{/if} {if $sip_transport_6 == 'tcp'}account.6.transport = 1{/if} -{if $sip_transport_6 == 'tcp'}account.6.transport = 2{/if} +{if $sip_transport_6 == 'tls'}account.6.transport = 2{/if} {if $sip_transport_6 == 'dns srv'}account.6.transport = 3{/if} #Configure the address of the backup outbound proxy server. diff --git a/resources/templates/provision/yealink/t22p/{$mac}.cfg b/resources/templates/provision/yealink/t22p/{$mac}.cfg index 97a09fc7da..6b91047e78 100644 --- a/resources/templates/provision/yealink/t22p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t22p/{$mac}.cfg @@ -43,9 +43,10 @@ account.1.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_1 == 'udp'}account.1.transport = 0{/if} {if $sip_transport_1 == 'tcp'}account.1.transport = 1{/if} -{if $sip_transport_1 == 'tcp'}account.1.transport = 2{/if} +{if $sip_transport_1 == 'tls'}account.1.transport = 2{/if} {if $sip_transport_1 == 'dns srv'}account.1.transport = 3{/if} + #Configure the address of the backup outbound proxy server. account.1.backup_outbound_host = @@ -352,7 +353,7 @@ account.2.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_2 == 'udp'}account.2.transport = 0{/if} {if $sip_transport_2 == 'tcp'}account.2.transport = 1{/if} -{if $sip_transport_2 == 'tcp'}account.2.transport = 2{/if} +{if $sip_transport_2 == 'tls'}account.2.transport = 2{/if} {if $sip_transport_2 == 'dns srv'}account.2.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -661,7 +662,7 @@ account.3.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_3 == 'udp'}account.3.transport = 0{/if} {if $sip_transport_3 == 'tcp'}account.3.transport = 1{/if} -{if $sip_transport_3 == 'tcp'}account.3.transport = 2{/if} +{if $sip_transport_3 == 'tls'}account.3.transport = 2{/if} {if $sip_transport_3 == 'dns srv'}account.3.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -970,7 +971,7 @@ account.4.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_4== 'udp'}account.4.transport = 0{/if} {if $sip_transport_4 == 'tcp'}account.4.transport = 1{/if} -{if $sip_transport_4 == 'tcp'}account.4.transport = 2{/if} +{if $sip_transport_4 == 'tls'}account.4.transport = 2{/if} {if $sip_transport_4 == 'dns srv'}account.4.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -1282,7 +1283,7 @@ account.5.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_5 == 'udp'}account.5.transport = 0{/if} {if $sip_transport_5 == 'tcp'}account.5.transport = 1{/if} -{if $sip_transport_5 == 'tcp'}account.5.transport = 2{/if} +{if $sip_transport_5 == 'tls'}account.5.transport = 2{/if} {if $sip_transport_5 == 'dns srv'}account.5.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -1589,7 +1590,7 @@ account.6.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_6 == 'udp'}account.6.transport = 0{/if} {if $sip_transport_6 == 'tcp'}account.6.transport = 1{/if} -{if $sip_transport_6 == 'tcp'}account.6.transport = 2{/if} +{if $sip_transport_6 == 'tls'}account.6.transport = 2{/if} {if $sip_transport_6 == 'dns srv'}account.6.transport = 3{/if} #Configure the address of the backup outbound proxy server. diff --git a/resources/templates/provision/yealink/t26p/{$mac}.cfg b/resources/templates/provision/yealink/t26p/{$mac}.cfg index 7617077953..9e198e7bcb 100644 --- a/resources/templates/provision/yealink/t26p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t26p/{$mac}.cfg @@ -43,9 +43,10 @@ account.1.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_1 == 'udp'}account.1.transport = 0{/if} {if $sip_transport_1 == 'tcp'}account.1.transport = 1{/if} -{if $sip_transport_1 == 'tcp'}account.1.transport = 2{/if} +{if $sip_transport_1 == 'tls'}account.1.transport = 2{/if} {if $sip_transport_1 == 'dns srv'}account.1.transport = 3{/if} + #Configure the address of the backup outbound proxy server. account.1.backup_outbound_host = @@ -352,7 +353,7 @@ account.2.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_2 == 'udp'}account.2.transport = 0{/if} {if $sip_transport_2 == 'tcp'}account.2.transport = 1{/if} -{if $sip_transport_2 == 'tcp'}account.2.transport = 2{/if} +{if $sip_transport_2 == 'tls'}account.2.transport = 2{/if} {if $sip_transport_2 == 'dns srv'}account.2.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -661,7 +662,7 @@ account.3.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_3 == 'udp'}account.3.transport = 0{/if} {if $sip_transport_3 == 'tcp'}account.3.transport = 1{/if} -{if $sip_transport_3 == 'tcp'}account.3.transport = 2{/if} +{if $sip_transport_3 == 'tls'}account.3.transport = 2{/if} {if $sip_transport_3 == 'dns srv'}account.3.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -970,7 +971,7 @@ account.4.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_4== 'udp'}account.4.transport = 0{/if} {if $sip_transport_4 == 'tcp'}account.4.transport = 1{/if} -{if $sip_transport_4 == 'tcp'}account.4.transport = 2{/if} +{if $sip_transport_4 == 'tls'}account.4.transport = 2{/if} {if $sip_transport_4 == 'dns srv'}account.4.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -1282,7 +1283,7 @@ account.5.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_5 == 'udp'}account.5.transport = 0{/if} {if $sip_transport_5 == 'tcp'}account.5.transport = 1{/if} -{if $sip_transport_5 == 'tcp'}account.5.transport = 2{/if} +{if $sip_transport_5 == 'tls'}account.5.transport = 2{/if} {if $sip_transport_5 == 'dns srv'}account.5.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -1589,7 +1590,7 @@ account.6.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_6 == 'udp'}account.6.transport = 0{/if} {if $sip_transport_6 == 'tcp'}account.6.transport = 1{/if} -{if $sip_transport_6 == 'tcp'}account.6.transport = 2{/if} +{if $sip_transport_6 == 'tls'}account.6.transport = 2{/if} {if $sip_transport_6 == 'dns srv'}account.6.transport = 3{/if} #Configure the address of the backup outbound proxy server. diff --git a/resources/templates/provision/yealink/t28p/{$mac}.cfg b/resources/templates/provision/yealink/t28p/{$mac}.cfg index 7617077953..9e198e7bcb 100644 --- a/resources/templates/provision/yealink/t28p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t28p/{$mac}.cfg @@ -43,9 +43,10 @@ account.1.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_1 == 'udp'}account.1.transport = 0{/if} {if $sip_transport_1 == 'tcp'}account.1.transport = 1{/if} -{if $sip_transport_1 == 'tcp'}account.1.transport = 2{/if} +{if $sip_transport_1 == 'tls'}account.1.transport = 2{/if} {if $sip_transport_1 == 'dns srv'}account.1.transport = 3{/if} + #Configure the address of the backup outbound proxy server. account.1.backup_outbound_host = @@ -352,7 +353,7 @@ account.2.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_2 == 'udp'}account.2.transport = 0{/if} {if $sip_transport_2 == 'tcp'}account.2.transport = 1{/if} -{if $sip_transport_2 == 'tcp'}account.2.transport = 2{/if} +{if $sip_transport_2 == 'tls'}account.2.transport = 2{/if} {if $sip_transport_2 == 'dns srv'}account.2.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -661,7 +662,7 @@ account.3.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_3 == 'udp'}account.3.transport = 0{/if} {if $sip_transport_3 == 'tcp'}account.3.transport = 1{/if} -{if $sip_transport_3 == 'tcp'}account.3.transport = 2{/if} +{if $sip_transport_3 == 'tls'}account.3.transport = 2{/if} {if $sip_transport_3 == 'dns srv'}account.3.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -970,7 +971,7 @@ account.4.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_4== 'udp'}account.4.transport = 0{/if} {if $sip_transport_4 == 'tcp'}account.4.transport = 1{/if} -{if $sip_transport_4 == 'tcp'}account.4.transport = 2{/if} +{if $sip_transport_4 == 'tls'}account.4.transport = 2{/if} {if $sip_transport_4 == 'dns srv'}account.4.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -1282,7 +1283,7 @@ account.5.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_5 == 'udp'}account.5.transport = 0{/if} {if $sip_transport_5 == 'tcp'}account.5.transport = 1{/if} -{if $sip_transport_5 == 'tcp'}account.5.transport = 2{/if} +{if $sip_transport_5 == 'tls'}account.5.transport = 2{/if} {if $sip_transport_5 == 'dns srv'}account.5.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -1589,7 +1590,7 @@ account.6.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_6 == 'udp'}account.6.transport = 0{/if} {if $sip_transport_6 == 'tcp'}account.6.transport = 1{/if} -{if $sip_transport_6 == 'tcp'}account.6.transport = 2{/if} +{if $sip_transport_6 == 'tls'}account.6.transport = 2{/if} {if $sip_transport_6 == 'dns srv'}account.6.transport = 3{/if} #Configure the address of the backup outbound proxy server. diff --git a/resources/templates/provision/yealink/t32g/{$mac}.cfg b/resources/templates/provision/yealink/t32g/{$mac}.cfg index 352fe0b5c5..9e198e7bcb 100644 --- a/resources/templates/provision/yealink/t32g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t32g/{$mac}.cfg @@ -42,11 +42,11 @@ account.1.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_1 == 'udp'}account.1.transport = 0{/if} -{if $sip_transport_1 == 'udp'}account.1.transport = 0{/if} {if $sip_transport_1 == 'tcp'}account.1.transport = 1{/if} -{if $sip_transport_1 == 'tcp'}account.1.transport = 2{/if} +{if $sip_transport_1 == 'tls'}account.1.transport = 2{/if} {if $sip_transport_1 == 'dns srv'}account.1.transport = 3{/if} + #Configure the address of the backup outbound proxy server. account.1.backup_outbound_host = @@ -353,7 +353,7 @@ account.2.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_2 == 'udp'}account.2.transport = 0{/if} {if $sip_transport_2 == 'tcp'}account.2.transport = 1{/if} -{if $sip_transport_2 == 'tcp'}account.2.transport = 2{/if} +{if $sip_transport_2 == 'tls'}account.2.transport = 2{/if} {if $sip_transport_2 == 'dns srv'}account.2.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -662,7 +662,7 @@ account.3.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_3 == 'udp'}account.3.transport = 0{/if} {if $sip_transport_3 == 'tcp'}account.3.transport = 1{/if} -{if $sip_transport_3 == 'tcp'}account.3.transport = 2{/if} +{if $sip_transport_3 == 'tls'}account.3.transport = 2{/if} {if $sip_transport_3 == 'dns srv'}account.3.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -971,7 +971,7 @@ account.4.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_4== 'udp'}account.4.transport = 0{/if} {if $sip_transport_4 == 'tcp'}account.4.transport = 1{/if} -{if $sip_transport_4 == 'tcp'}account.4.transport = 2{/if} +{if $sip_transport_4 == 'tls'}account.4.transport = 2{/if} {if $sip_transport_4 == 'dns srv'}account.4.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -1283,7 +1283,7 @@ account.5.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_5 == 'udp'}account.5.transport = 0{/if} {if $sip_transport_5 == 'tcp'}account.5.transport = 1{/if} -{if $sip_transport_5 == 'tcp'}account.5.transport = 2{/if} +{if $sip_transport_5 == 'tls'}account.5.transport = 2{/if} {if $sip_transport_5 == 'dns srv'}account.5.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -1590,7 +1590,7 @@ account.6.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_6 == 'udp'}account.6.transport = 0{/if} {if $sip_transport_6 == 'tcp'}account.6.transport = 1{/if} -{if $sip_transport_6 == 'tcp'}account.6.transport = 2{/if} +{if $sip_transport_6 == 'tls'}account.6.transport = 2{/if} {if $sip_transport_6 == 'dns srv'}account.6.transport = 3{/if} #Configure the address of the backup outbound proxy server. diff --git a/resources/templates/provision/yealink/t38g/{$mac}.cfg b/resources/templates/provision/yealink/t38g/{$mac}.cfg index 7617077953..9e198e7bcb 100644 --- a/resources/templates/provision/yealink/t38g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t38g/{$mac}.cfg @@ -43,9 +43,10 @@ account.1.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_1 == 'udp'}account.1.transport = 0{/if} {if $sip_transport_1 == 'tcp'}account.1.transport = 1{/if} -{if $sip_transport_1 == 'tcp'}account.1.transport = 2{/if} +{if $sip_transport_1 == 'tls'}account.1.transport = 2{/if} {if $sip_transport_1 == 'dns srv'}account.1.transport = 3{/if} + #Configure the address of the backup outbound proxy server. account.1.backup_outbound_host = @@ -352,7 +353,7 @@ account.2.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_2 == 'udp'}account.2.transport = 0{/if} {if $sip_transport_2 == 'tcp'}account.2.transport = 1{/if} -{if $sip_transport_2 == 'tcp'}account.2.transport = 2{/if} +{if $sip_transport_2 == 'tls'}account.2.transport = 2{/if} {if $sip_transport_2 == 'dns srv'}account.2.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -661,7 +662,7 @@ account.3.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_3 == 'udp'}account.3.transport = 0{/if} {if $sip_transport_3 == 'tcp'}account.3.transport = 1{/if} -{if $sip_transport_3 == 'tcp'}account.3.transport = 2{/if} +{if $sip_transport_3 == 'tls'}account.3.transport = 2{/if} {if $sip_transport_3 == 'dns srv'}account.3.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -970,7 +971,7 @@ account.4.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_4== 'udp'}account.4.transport = 0{/if} {if $sip_transport_4 == 'tcp'}account.4.transport = 1{/if} -{if $sip_transport_4 == 'tcp'}account.4.transport = 2{/if} +{if $sip_transport_4 == 'tls'}account.4.transport = 2{/if} {if $sip_transport_4 == 'dns srv'}account.4.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -1282,7 +1283,7 @@ account.5.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_5 == 'udp'}account.5.transport = 0{/if} {if $sip_transport_5 == 'tcp'}account.5.transport = 1{/if} -{if $sip_transport_5 == 'tcp'}account.5.transport = 2{/if} +{if $sip_transport_5 == 'tls'}account.5.transport = 2{/if} {if $sip_transport_5 == 'dns srv'}account.5.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -1589,7 +1590,7 @@ account.6.outbound_port = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_6 == 'udp'}account.6.transport = 0{/if} {if $sip_transport_6 == 'tcp'}account.6.transport = 1{/if} -{if $sip_transport_6 == 'tcp'}account.6.transport = 2{/if} +{if $sip_transport_6 == 'tls'}account.6.transport = 2{/if} {if $sip_transport_6 == 'dns srv'}account.6.transport = 3{/if} #Configure the address of the backup outbound proxy server. diff --git a/resources/templates/provision/yealink/t46g/{$mac}.cfg b/resources/templates/provision/yealink/t46g/{$mac}.cfg index 24d00c8758..5264d4e085 100644 --- a/resources/templates/provision/yealink/t46g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t46g/{$mac}.cfg @@ -22,7 +22,7 @@ account.1.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_1 == 'udp'}account.1.transport = 0{/if} {if $sip_transport_1 == 'tcp'}account.1.transport = 1{/if} -{if $sip_transport_1 == 'tcp'}account.1.transport = 2{/if} +{if $sip_transport_1 == 'tls'}account.1.transport = 2{/if} {if $sip_transport_1 == 'dns srv'}account.1.transport = 3{/if} @@ -474,7 +474,7 @@ account.2.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_2 == 'udp'}account.2.transport = 0{/if} {if $sip_transport_2 == 'tcp'}account.2.transport = 1{/if} -{if $sip_transport_2 == 'tcp'}account.2.transport = 2{/if} +{if $sip_transport_2 == 'tls'}account.2.transport = 2{/if} {if $sip_transport_2 == 'dns srv'}account.2.transport = 3{/if} @@ -962,7 +962,7 @@ account.3.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_3 == 'udp'}account.3.transport = 0{/if} {if $sip_transport_3 == 'tcp'}account.3.transport = 1{/if} -{if $sip_transport_3 == 'tcp'}account.3.transport = 2{/if} +{if $sip_transport_3 == 'tls'}account.3.transport = 2{/if} {if $sip_transport_3 == 'dns srv'}account.3.transport = 3{/if} ####################################################################################### @@ -1450,7 +1450,7 @@ account.4.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_4 == 'udp'}account.4.transport = 0{/if} {if $sip_transport_4 == 'tcp'}account.4.transport = 1{/if} -{if $sip_transport_4 == 'tcp'}account.4.transport = 2{/if} +{if $sip_transport_4 == 'tls'}account.4.transport = 2{/if} {if $sip_transport_4 == 'dns srv'}account.4.transport = 3{/if} ####################################################################################### @@ -1937,7 +1937,7 @@ account.5.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_5 == 'udp'}account.5.transport = 0{/if} {if $sip_transport_5 == 'tcp'}account.5.transport = 1{/if} -{if $sip_transport_5 == 'tcp'}account.5.transport = 2{/if} +{if $sip_transport_5 == 'tls'}account.5.transport = 2{/if} {if $sip_transport_5 == 'dns srv'}account.5.transport = 3{/if} ####################################################################################### @@ -2424,7 +2424,7 @@ account.6.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_6 == 'udp'}account.6.transport = 0{/if} {if $sip_transport_6 == 'tcp'}account.6.transport = 1{/if} -{if $sip_transport_6 == 'tcp'}account.6.transport = 2{/if} +{if $sip_transport_6 == 'tls'}account.6.transport = 2{/if} {if $sip_transport_6 == 'dns srv'}account.6.transport = 3{/if} ####################################################################################### diff --git a/resources/templates/provision/yealink/vp530/{$mac}.cfg b/resources/templates/provision/yealink/vp530/{$mac}.cfg index a2a343a8ec..db80d6f3fe 100644 --- a/resources/templates/provision/yealink/vp530/{$mac}.cfg +++ b/resources/templates/provision/yealink/vp530/{$mac}.cfg @@ -53,7 +53,7 @@ account.1.sip_server_host_readonly = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_1 == 'udp'}account.1.transport = 0{/if} {if $sip_transport_1 == 'tcp'}account.1.transport = 1{/if} -{if $sip_transport_1 == 'tcp'}account.1.transport = 2{/if} +{if $sip_transport_1 == 'tls'}account.1.transport = 2{/if} {if $sip_transport_1 == 'dns srv'}account.1.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -392,7 +392,7 @@ account.2.sip_server_host_readonly = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_2 == 'udp'}account.2.transport = 0{/if} {if $sip_transport_2 == 'tcp'}account.2.transport = 1{/if} -{if $sip_transport_2 == 'tcp'}account.2.transport = 2{/if} +{if $sip_transport_2 == 'tls'}account.2.transport = 2{/if} {if $sip_transport_2 == 'dns srv'}account.2.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -731,7 +731,7 @@ account.3.sip_server_host_readonly = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_3 == 'udp'}account.3.transport = 0{/if} {if $sip_transport_3 == 'tcp'}account.3.transport = 1{/if} -{if $sip_transport_3 == 'tcp'}account.3.transport = 2{/if} +{if $sip_transport_3 == 'tls'}account.3.transport = 2{/if} {if $sip_transport_3 == 'dns srv'}account.3.transport = 3{/if} #Configure the address of the backup outbound proxy server. @@ -1070,7 +1070,7 @@ account.4.sip_server_host_readonly = #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_4== 'udp'}account.4.transport = 0{/if} {if $sip_transport_4 == 'tcp'}account.4.transport = 1{/if} -{if $sip_transport_4 == 'tcp'}account.4.transport = 2{/if} +{if $sip_transport_4 == 'tls'}account.4.transport = 2{/if} {if $sip_transport_4 == 'dns srv'}account.4.transport = 3{/if} #Configure the address of the backup outbound proxy server.