diff --git a/app/grandstream/app_config.php b/app/grandstream/app_config.php index 99b057b553..c5e2f2a60c 100644 --- a/app/grandstream/app_config.php +++ b/app/grandstream/app_config.php @@ -782,6 +782,14 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Accept Incoming SIP from Proxy Only. 0 - No, 1 - Yes. Default is 0"; $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "643bd502-9052-45a8-9811-5d42669a4a89"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_dnssrv_transport"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "0"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "SIP transport if dns/srv is selected. Value options - udp, tcp, tls. "; + $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "2aebb9db-ade3-4983-bffc-a53be0ad30d2"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_disable_active_mpk_page"; diff --git a/resources/templates/provision/grandstream/grp2612/{$mac}.xml b/resources/templates/provision/grandstream/grp2612/{$mac}.xml index ef6607a653..70a4a884e9 100644 --- a/resources/templates/provision/grandstream/grp2612/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2612/{$mac}.xml @@ -220,7 +220,15 @@ {if $account.1.sip_transport == 'udp'}{$tp=0}{/if} {if $account.1.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.1.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.1.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.1.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -1181,7 +1189,15 @@ {if $account.2.sip_transport == 'udp'}{$tp=0}{/if} {if $account.2.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.2.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.2.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.2.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} diff --git a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml index 3fd0689293..5ae998517c 100644 --- a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml @@ -220,7 +220,15 @@ {if $account.1.sip_transport == 'udp'}{$tp=0}{/if} {if $account.1.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.1.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.1.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.1.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -1181,7 +1189,15 @@ {if $account.2.sip_transport == 'udp'}{$tp=0}{/if} {if $account.2.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.2.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.2.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.2.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} diff --git a/resources/templates/provision/grandstream/grp2613/{$mac}.xml b/resources/templates/provision/grandstream/grp2613/{$mac}.xml index 01090401cd..ed01595ffe 100644 --- a/resources/templates/provision/grandstream/grp2613/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2613/{$mac}.xml @@ -220,7 +220,15 @@ {if $account.1.sip_transport == 'udp'}{$tp=0}{/if} {if $account.1.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.1.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.1.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.1.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -1181,7 +1189,15 @@ {if $account.2.sip_transport == 'udp'}{$tp=0}{/if} {if $account.2.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.2.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.2.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.2.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -2133,7 +2149,15 @@ {if $account.3.sip_transport == 'udp'}{$tp=0}{/if} {if $account.3.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.3.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.3.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.3.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} diff --git a/resources/templates/provision/grandstream/grp2614/{$mac}.xml b/resources/templates/provision/grandstream/grp2614/{$mac}.xml index 995f2b131f..a6300a608a 100644 --- a/resources/templates/provision/grandstream/grp2614/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2614/{$mac}.xml @@ -220,7 +220,15 @@ {if $account.1.sip_transport == 'udp'}{$tp=0}{/if} {if $account.1.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.1.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.1.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.1.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -1181,7 +1189,15 @@ {if $account.2.sip_transport == 'udp'}{$tp=0}{/if} {if $account.2.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.2.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.2.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.2.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -2133,7 +2149,15 @@ {if $account.3.sip_transport == 'udp'}{$tp=0}{/if} {if $account.3.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.3.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.3.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.3.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -3086,7 +3110,15 @@ {if $account.4.sip_transport == 'udp'}{$tp=0}{/if} {if $account.4.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.4.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.4.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.4.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} diff --git a/resources/templates/provision/grandstream/grp2615/{$mac}.xml b/resources/templates/provision/grandstream/grp2615/{$mac}.xml index 0225056494..78fc76c69c 100644 --- a/resources/templates/provision/grandstream/grp2615/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2615/{$mac}.xml @@ -220,7 +220,15 @@ {if $account.1.sip_transport == 'udp'}{$tp=0}{/if} {if $account.1.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.1.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.1.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.1.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -1197,7 +1205,15 @@ {if $account.2.sip_transport == 'udp'}{$tp=0}{/if} {if $account.2.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.2.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.2.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.2.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -2165,7 +2181,15 @@ {if $account.3.sip_transport == 'udp'}{$tp=0}{/if} {if $account.3.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.3.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.3.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.3.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -3134,7 +3158,15 @@ {if $account.4.sip_transport == 'udp'}{$tp=0}{/if} {if $account.4.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.4.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.4.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.4.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -4104,7 +4136,15 @@ {if $account.5.sip_transport == 'udp'}{$tp=0}{/if} {if $account.5.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.5.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.5.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.5.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} diff --git a/resources/templates/provision/grandstream/grp2616/{$mac}.xml b/resources/templates/provision/grandstream/grp2616/{$mac}.xml index 59b12d0976..2ac48431ed 100644 --- a/resources/templates/provision/grandstream/grp2616/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2616/{$mac}.xml @@ -220,7 +220,15 @@ {if $account.1.sip_transport == 'udp'}{$tp=0}{/if} {if $account.1.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.1.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.1.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.1.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -1181,7 +1189,15 @@ {if $account.2.sip_transport == 'udp'}{$tp=0}{/if} {if $account.2.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.2.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.2.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.2.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -2133,7 +2149,15 @@ {if $account.3.sip_transport == 'udp'}{$tp=0}{/if} {if $account.3.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.3.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.3.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.3.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -3086,7 +3110,15 @@ {if $account.4.sip_transport == 'udp'}{$tp=0}{/if} {if $account.4.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.4.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.4.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.4.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -4040,7 +4072,15 @@ {if $account.5.sip_transport == 'udp'}{$tp=0}{/if} {if $account.5.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.5.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.5.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.5.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -4993,7 +5033,15 @@ {if $account.6.sip_transport == 'udp'}{$tp=0}{/if} {if $account.6.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.6.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.6.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.6.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} diff --git a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml index 18b369243d..efe9c404b1 100644 --- a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml @@ -214,7 +214,15 @@ {if $account.1.sip_transport == 'udp'}{$tp=0}{/if} {if $account.1.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.1.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.1.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.1.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -1195,7 +1203,15 @@ {if $account.2.sip_transport == 'udp'}{$tp=0}{/if} {if $account.2.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.2.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.2.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.2.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -2166,7 +2182,15 @@ {if $account.3.sip_transport == 'udp'}{$tp=0}{/if} {if $account.3.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.3.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.3.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.3.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -3139,7 +3163,15 @@ {if $account.4.sip_transport == 'udp'}{$tp=0}{/if} {if $account.4.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.4.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.4.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.4.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -4114,7 +4146,15 @@ {if $account.5.sip_transport == 'udp'}{$tp=0}{/if} {if $account.5.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.5.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.5.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.5.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml index 5f010c0054..4d4179ff66 100644 --- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml @@ -224,7 +224,15 @@ {if $account.1.sip_transport == 'udp'}{$tp=0}{/if} {if $account.1.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.1.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.1.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.1.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -1185,7 +1193,15 @@ {if $account.2.sip_transport == 'udp'}{$tp=0}{/if} {if $account.2.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.2.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.2.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.2.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -2137,7 +2153,15 @@ {if $account.3.sip_transport == 'udp'}{$tp=0}{/if} {if $account.3.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.3.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.3.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.3.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -3089,7 +3113,15 @@ {if $account.4.sip_transport == 'udp'}{$tp=0}{/if} {if $account.4.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.4.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.4.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.4.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -4043,7 +4075,15 @@ {if $account.5.sip_transport == 'udp'}{$tp=0}{/if} {if $account.5.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.5.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.5.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.5.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -4996,7 +5036,15 @@ {if $account.6.sip_transport == 'udp'}{$tp=0}{/if} {if $account.6.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.6.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.6.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.6.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml index 9d027712f9..e42946a0a8 100644 --- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml @@ -224,7 +224,15 @@ {if $account.1.sip_transport == 'udp'}{$tp=0}{/if} {if $account.1.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.1.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.1.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.1.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -1185,7 +1193,15 @@ {if $account.2.sip_transport == 'udp'}{$tp=0}{/if} {if $account.2.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.2.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.2.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.2.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -2137,7 +2153,15 @@ {if $account.3.sip_transport == 'udp'}{$tp=0}{/if} {if $account.3.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.3.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.3.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.3.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -3089,7 +3113,15 @@ {if $account.4.sip_transport == 'udp'}{$tp=0}{/if} {if $account.4.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.4.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.4.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.4.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -4043,7 +4075,15 @@ {if $account.5.sip_transport == 'udp'}{$tp=0}{/if} {if $account.5.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.5.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.5.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.5.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -4996,7 +5036,15 @@ {if $account.6.sip_transport == 'udp'}{$tp=0}{/if} {if $account.6.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.6.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.6.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.6.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml index 5f010c0054..4d4179ff66 100644 --- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml @@ -224,7 +224,15 @@ {if $account.1.sip_transport == 'udp'}{$tp=0}{/if} {if $account.1.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.1.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.1.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.1.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -1185,7 +1193,15 @@ {if $account.2.sip_transport == 'udp'}{$tp=0}{/if} {if $account.2.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.2.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.2.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.2.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -2137,7 +2153,15 @@ {if $account.3.sip_transport == 'udp'}{$tp=0}{/if} {if $account.3.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.3.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.3.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.3.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -3089,7 +3113,15 @@ {if $account.4.sip_transport == 'udp'}{$tp=0}{/if} {if $account.4.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.4.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.4.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.4.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -4043,7 +4075,15 @@ {if $account.5.sip_transport == 'udp'}{$tp=0}{/if} {if $account.5.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.5.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.5.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.5.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -4996,7 +5036,15 @@ {if $account.6.sip_transport == 'udp'}{$tp=0}{/if} {if $account.6.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.6.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.6.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.6.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml index 5f010c0054..4d4179ff66 100644 --- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml @@ -224,7 +224,15 @@ {if $account.1.sip_transport == 'udp'}{$tp=0}{/if} {if $account.1.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.1.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.1.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.1.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -1185,7 +1193,15 @@ {if $account.2.sip_transport == 'udp'}{$tp=0}{/if} {if $account.2.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.2.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.2.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.2.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -2137,7 +2153,15 @@ {if $account.3.sip_transport == 'udp'}{$tp=0}{/if} {if $account.3.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.3.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.3.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.3.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -3089,7 +3113,15 @@ {if $account.4.sip_transport == 'udp'}{$tp=0}{/if} {if $account.4.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.4.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.4.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.4.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -4043,7 +4075,15 @@ {if $account.5.sip_transport == 'udp'}{$tp=0}{/if} {if $account.5.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.5.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.5.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.5.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -4996,7 +5036,15 @@ {if $account.6.sip_transport == 'udp'}{$tp=0}{/if} {if $account.6.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.6.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.6.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.6.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml index 5f010c0054..4d4179ff66 100644 --- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml @@ -224,7 +224,15 @@ {if $account.1.sip_transport == 'udp'}{$tp=0}{/if} {if $account.1.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.1.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.1.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.1.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -1185,7 +1193,15 @@ {if $account.2.sip_transport == 'udp'}{$tp=0}{/if} {if $account.2.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.2.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.2.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.2.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -2137,7 +2153,15 @@ {if $account.3.sip_transport == 'udp'}{$tp=0}{/if} {if $account.3.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.3.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.3.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.3.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -3089,7 +3113,15 @@ {if $account.4.sip_transport == 'udp'}{$tp=0}{/if} {if $account.4.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.4.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.4.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.4.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -4043,7 +4075,15 @@ {if $account.5.sip_transport == 'udp'}{$tp=0}{/if} {if $account.5.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.5.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.5.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.5.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp} @@ -4996,7 +5036,15 @@ {if $account.6.sip_transport == 'udp'}{$tp=0}{/if} {if $account.6.sip_transport == 'tcp'}{$tp=1}{/if} {if $account.6.sip_transport == 'tls'}{$tp=2}{/if} -{if $account.6.sip_transport == 'dns srv'}{$tp=1}{/if} +{if $account.6.sip_transport == 'dns srv'} + {if isset($grandstream_dnssrv_transport)} + {if $grandstream_dnssrv_transport == 'udp'}{$tp=0} + {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2} + {else}{$tp=1} + {/if} + {else}{$tp=1} + {/if} +{/if} {$tp}