From 0e17971798d47204b673412c2af68d3ddb6fe92b Mon Sep 17 00:00:00 2001 From: demonspork Date: Wed, 12 May 2021 09:38:06 -0500 Subject: [PATCH 1/2] Grandstream Fix Logic for outbound proxy and secondary servers when using SRV records There was an illogical if/else statement that the "else" condition would always set a null value, so it didn't really matter. Re-wrote it to properly filter if the transport is set to dns srv and not affix the SIP Port to the server address. --- .../provision/grandstream/dp750/{$mac}.xml | 14 +++-- .../provision/grandstream/gac2500/{$mac}.xml | 3 +- .../provision/grandstream/grp2612/{$mac}.xml | 22 ++++--- .../provision/grandstream/grp2612w/{$mac}.xml | 22 ++++--- .../provision/grandstream/grp2613/{$mac}.xml | 32 +++++++--- .../provision/grandstream/grp2614/{$mac}.xml | 42 +++++++++---- .../provision/grandstream/grp2615/{$mac}.xml | 52 ++++++++++----- .../provision/grandstream/grp2616/{$mac}.xml | 62 ++++++++++++------ .../provision/grandstream/grp26xx/{$mac}.xml | 52 ++++++++++----- .../provision/grandstream/gxp110x/{$mac}.xml | 2 +- .../provision/grandstream/gxp116x/{$mac}.xml | 2 +- .../provision/grandstream/gxp140x/{$mac}.xml | 2 +- .../grandstream/gxp140xbk/{$mac}.xml | 2 +- .../provision/grandstream/gxp1450/{$mac}.xml | 2 +- .../grandstream/gxp1450bk/{$mac}.xml | 2 +- .../provision/grandstream/gxp16xx/{$mac}.xml | 32 +++++++--- .../provision/grandstream/gxp17xx/{$mac}.xml | 26 +++++--- .../provision/grandstream/gxp2100/{$mac}.xml | 2 +- .../provision/grandstream/gxp2124/{$mac}.xml | 2 +- .../provision/grandstream/gxp2130/{$mac}.xml | 62 ++++++++++++------ .../provision/grandstream/gxp2135/{$mac}.xml | 63 +++++++++++++------ .../provision/grandstream/gxp2140/{$mac}.xml | 62 ++++++++++++------ .../provision/grandstream/gxp2160/{$mac}.xml | 62 ++++++++++++------ .../provision/grandstream/gxp2170/{$mac}.xml | 62 ++++++++++++------ .../provision/grandstream/gxp21xx/{$mac}.xml | 2 +- .../provision/grandstream/gxv3240/{$mac}.xml | 2 +- .../provision/grandstream/gxw42xx/{$mac}.xml | 6 +- .../provision/grandstream/ht801/{$mac}.xml | 4 ++ .../provision/grandstream/ht802/{$mac}.xml | 10 ++- .../provision/grandstream/ht818/{$mac}.xml | 2 +- .../provision/grandstream/wp820/{$mac}.xml | 20 ++++-- 31 files changed, 505 insertions(+), 227 deletions(-) diff --git a/resources/templates/provision/grandstream/dp750/{$mac}.xml b/resources/templates/provision/grandstream/dp750/{$mac}.xml index 0a55bf9836..5ffe0529bc 100644 --- a/resources/templates/provision/grandstream/dp750/{$mac}.xml +++ b/resources/templates/provision/grandstream/dp750/{$mac}.xml @@ -27,12 +27,16 @@ +{if $account.1.sip_transport != 'dns srv'} {$account.1.server_address}:{$account.1.sip_port} +{else} +{$account.1.server_address} +{/if} -{if isset($account.1.server_address_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)} {$account.1.server_address_secondary}:{$account.1.sip_port} {else} {$account.1.server_address_secondary} @@ -46,7 +50,7 @@ -{if isset($account.1.outbound_proxy_primary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)} {$account.1.outbound_proxy_primary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_primary} @@ -590,7 +594,7 @@ -{if isset($account.2.outbound_proxy_primary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)} {$account.2.outbound_proxy_primary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_primary} @@ -1119,7 +1123,7 @@ -{if isset($account.3.outbound_proxy_primary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)} {$account.3.outbound_proxy_primary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_primary} @@ -1649,7 +1653,7 @@ -{if isset($account.4.outbound_proxy_primary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_primary)} {$account.4.outbound_proxy_primary}:{$account.4.sip_port} {else} {$account.4.outbound_proxy_primary} diff --git a/resources/templates/provision/grandstream/gac2500/{$mac}.xml b/resources/templates/provision/grandstream/gac2500/{$mac}.xml index 1b52e4558b..4762e5049b 100644 --- a/resources/templates/provision/grandstream/gac2500/{$mac}.xml +++ b/resources/templates/provision/grandstream/gac2500/{$mac}.xml @@ -3771,8 +3771,7 @@ - {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} - + 0 diff --git a/resources/templates/provision/grandstream/grp2612/{$mac}.xml b/resources/templates/provision/grandstream/grp2612/{$mac}.xml index 2c39cd0953..407907fb70 100644 --- a/resources/templates/provision/grandstream/grp2612/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2612/{$mac}.xml @@ -27,12 +27,16 @@ +{if $account.1.sip_transport != 'dns srv'} {$account.1.server_address}:{$account.1.sip_port} +{else} + {$account.1.server_address} +{/if} -{if isset($account.1.server_address_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)} {$account.1.server_address_secondary}:{$account.1.sip_port} {else} {$account.1.server_address_secondary} @@ -41,7 +45,7 @@ -{if isset($account.1.outbound_proxy_primary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)} {$account.1.outbound_proxy_primary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_primary} @@ -50,7 +54,7 @@ -{if isset($account.1.outbound_proxy_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)} {$account.1.outbound_proxy_secondary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_secondary} @@ -985,12 +989,16 @@ +{if $account.2.sip_transport != 'dns srv'} {$account.2.server_address}:{$account.2.sip_port} +{else} + {$account.2.server_address} +{/if} -{if isset($account.2.server_address_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)} {$account.2.server_address_secondary}:{$account.2.sip_port} {else} {$account.2.server_address_secondary} @@ -999,7 +1007,7 @@ -{if isset($account.2.outbound_proxy_primary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)} {$account.2.outbound_proxy_primary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_primary} @@ -1008,7 +1016,7 @@ -{if isset($account.2.outbound_proxy_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)} {$account.2.outbound_proxy_secondary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_secondary} @@ -1919,7 +1927,7 @@ - {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} + 2 diff --git a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml index b2c271e71b..289a40ddca 100644 --- a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml @@ -27,12 +27,16 @@ +{if $account.1.sip_transport != 'dns srv'} {$account.1.server_address}:{$account.1.sip_port} +{else} + {$account.1.server_address} +{/if} -{if isset($account.1.server_address_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)} {$account.1.server_address_secondary}:{$account.1.sip_port} {else} {$account.1.server_address_secondary} @@ -41,7 +45,7 @@ -{if isset($account.1.outbound_proxy_primary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)} {$account.1.outbound_proxy_primary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_primary} @@ -50,7 +54,7 @@ -{if isset($account.1.outbound_proxy_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)} {$account.1.outbound_proxy_secondary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_secondary} @@ -985,12 +989,16 @@ +{if $account.2.sip_transport != 'dns srv'} {$account.2.server_address}:{$account.2.sip_port} +{else} + {$account.2.server_address} +{/if} -{if isset($account.2.server_address_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)} {$account.2.server_address_secondary}:{$account.2.sip_port} {else} {$account.2.server_address_secondary} @@ -999,7 +1007,7 @@ -{if isset($account.2.outbound_proxy_primary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)} {$account.2.outbound_proxy_primary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_primary} @@ -1008,7 +1016,7 @@ -{if isset($account.2.outbound_proxy_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)} {$account.2.outbound_proxy_secondary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_secondary} @@ -1919,7 +1927,7 @@ - {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} + 2 diff --git a/resources/templates/provision/grandstream/grp2613/{$mac}.xml b/resources/templates/provision/grandstream/grp2613/{$mac}.xml index 70ad5a1c88..4494504b70 100644 --- a/resources/templates/provision/grandstream/grp2613/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2613/{$mac}.xml @@ -27,12 +27,16 @@ +{if $account.1.sip_transport != 'dns srv'} {$account.1.server_address}:{$account.1.sip_port} +{else} + {$account.1.server_address} +{/if} -{if isset($account.1.server_address_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)} {$account.1.server_address_secondary}:{$account.1.sip_port} {else} {$account.1.server_address_secondary} @@ -41,7 +45,7 @@ -{if isset($account.1.outbound_proxy_primary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)} {$account.1.outbound_proxy_primary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_primary} @@ -50,7 +54,7 @@ -{if isset($account.1.outbound_proxy_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)} {$account.1.outbound_proxy_secondary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_secondary} @@ -985,12 +989,16 @@ +{if $account.2.sip_transport != 'dns srv'} {$account.2.server_address}:{$account.2.sip_port} +{else} + {$account.2.server_address} +{/if} -{if isset($account.2.server_address_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)} {$account.2.server_address_secondary}:{$account.2.sip_port} {else} {$account.2.server_address_secondary} @@ -999,7 +1007,7 @@ -{if isset($account.2.outbound_proxy_primary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)} {$account.2.outbound_proxy_primary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_primary} @@ -1008,7 +1016,7 @@ -{if isset($account.2.outbound_proxy_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)} {$account.2.outbound_proxy_secondary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_secondary} @@ -1934,12 +1942,16 @@ +{if $account.3.sip_transport != 'dns srv'} {$account.3.server_address}:{$account.3.sip_port} +{else} + {$account.3.server_address} +{/if} -{if isset($account.3.server_address_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)} {$account.3.server_address_secondary}:{$account.3.sip_port} {else} {$account.3.server_address_secondary} @@ -1948,7 +1960,7 @@ -{if isset($account.3.outbound_proxy_primary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)} {$account.3.outbound_proxy_primary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_primary} @@ -1957,7 +1969,7 @@ -{if isset($account.3.outbound_proxy_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)} {$account.3.outbound_proxy_secondary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_secondary} @@ -2867,7 +2879,7 @@ - {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} + 0 diff --git a/resources/templates/provision/grandstream/grp2614/{$mac}.xml b/resources/templates/provision/grandstream/grp2614/{$mac}.xml index 86977dc9f8..bf4b837ff1 100644 --- a/resources/templates/provision/grandstream/grp2614/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2614/{$mac}.xml @@ -27,12 +27,16 @@ +{if $account.1.sip_transport != 'dns srv'} {$account.1.server_address}:{$account.1.sip_port} +{else} + {$account.1.server_address} +{/if} -{if isset($account.1.server_address_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)} {$account.1.server_address_secondary}:{$account.1.sip_port} {else} {$account.1.server_address_secondary} @@ -41,7 +45,7 @@ -{if isset($account.1.outbound_proxy_primary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)} {$account.1.outbound_proxy_primary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_primary} @@ -50,7 +54,7 @@ -{if isset($account.1.outbound_proxy_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)} {$account.1.outbound_proxy_secondary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_secondary} @@ -985,12 +989,16 @@ +{if $account.2.sip_transport != 'dns srv'} {$account.2.server_address}:{$account.2.sip_port} +{else} + {$account.2.server_address} +{/if} -{if isset($account.2.server_address_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)} {$account.2.server_address_secondary}:{$account.2.sip_port} {else} {$account.2.server_address_secondary} @@ -999,7 +1007,7 @@ -{if isset($account.2.outbound_proxy_primary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)} {$account.2.outbound_proxy_primary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_primary} @@ -1008,7 +1016,7 @@ -{if isset($account.2.outbound_proxy_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)} {$account.2.outbound_proxy_secondary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_secondary} @@ -1934,12 +1942,16 @@ +{if $account.3.sip_transport != 'dns srv'} {$account.3.server_address}:{$account.3.sip_port} +{else} + {$account.3.server_address} +{/if} -{if isset($account.3.server_address_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)} {$account.3.server_address_secondary}:{$account.3.sip_port} {else} {$account.3.server_address_secondary} @@ -1948,7 +1960,7 @@ -{if isset($account.3.outbound_proxy_primary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)} {$account.3.outbound_proxy_primary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_primary} @@ -1957,7 +1969,7 @@ -{if isset($account.3.outbound_proxy_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)} {$account.3.outbound_proxy_secondary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_secondary} @@ -2882,12 +2894,16 @@ +{if $account.4.sip_transport != 'dns srv'} {$account.4.server_address}:{$account.4.sip_port} +{else} + {$account.4.server_address} +{/if} -{if isset($account.4.server_address_secondary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.server_address_secondary)} {$account.4.server_address_secondary}:{$account.4.sip_port} {else} {$account.4.server_address_secondary} @@ -2896,7 +2912,7 @@ -{if isset($account.4.outbound_proxy_primary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_primary)} {$account.4.outbound_proxy_primary}:{$account.4.sip_port} {else} {$account.4.outbound_proxy_primary} @@ -2905,7 +2921,7 @@ -{if isset($account.4.outbound_proxy_secondary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_secondary)} {$account.4.outbound_proxy_secondary}:{$account.4.sip_port} {else} {$account.4.outbound_proxy_secondary} @@ -3818,7 +3834,7 @@ - {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} + 0 diff --git a/resources/templates/provision/grandstream/grp2615/{$mac}.xml b/resources/templates/provision/grandstream/grp2615/{$mac}.xml index 59da396f8f..9884ea4be4 100644 --- a/resources/templates/provision/grandstream/grp2615/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2615/{$mac}.xml @@ -27,12 +27,16 @@ +{if $account.1.sip_transport != 'dns srv'} {$account.1.server_address}:{$account.1.sip_port} +{else} + {$account.1.server_address} +{/if} -{if isset($account.1.server_address_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)} {$account.1.server_address_secondary}:{$account.1.sip_port} {else} {$account.1.server_address_secondary} @@ -41,7 +45,7 @@ -{if isset($account.1.outbound_proxy_primary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)} {$account.1.outbound_proxy_primary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_primary} @@ -50,7 +54,7 @@ -{if isset($account.1.outbound_proxy_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)} {$account.1.outbound_proxy_secondary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_secondary} @@ -1001,12 +1005,16 @@ +{if $account.2.sip_transport != 'dns srv'} {$account.2.server_address}:{$account.2.sip_port} +{else} + {$account.2.server_address} +{/if} -{if isset($account.2.server_address_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)} {$account.2.server_address_secondary}:{$account.2.sip_port} {else} {$account.2.server_address_secondary} @@ -1015,7 +1023,7 @@ -{if isset($account.2.outbound_proxy_primary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)} {$account.2.outbound_proxy_primary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_primary} @@ -1024,7 +1032,7 @@ -{if isset($account.2.outbound_proxy_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)} {$account.2.outbound_proxy_secondary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_secondary} @@ -1966,12 +1974,16 @@ +{if $account.3.sip_transport != 'dns srv'} {$account.3.server_address}:{$account.3.sip_port} +{else} + {$account.3.server_address} +{/if} -{if isset($account.3.server_address_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)} {$account.3.server_address_secondary}:{$account.3.sip_port} {else} {$account.3.server_address_secondary} @@ -1980,7 +1992,7 @@ -{if isset($account.3.outbound_proxy_primary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)} {$account.3.outbound_proxy_primary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_primary} @@ -1989,7 +2001,7 @@ -{if isset($account.3.outbound_proxy_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)} {$account.3.outbound_proxy_secondary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_secondary} @@ -2930,12 +2942,16 @@ +{if $account.4.sip_transport != 'dns srv'} {$account.4.server_address}:{$account.4.sip_port} +{else} + {$account.4.server_address} +{/if} -{if isset($account.4.server_address_secondary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.server_address_secondary)} {$account.4.server_address_secondary}:{$account.4.sip_port} {else} {$account.4.server_address_secondary} @@ -2944,7 +2960,7 @@ -{if isset($account.4.outbound_proxy_primary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_primary)} {$account.4.outbound_proxy_primary}:{$account.4.sip_port} {else} {$account.4.outbound_proxy_primary} @@ -2953,7 +2969,7 @@ -{if isset($account.4.outbound_proxy_secondary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_secondary)} {$account.4.outbound_proxy_secondary}:{$account.4.sip_port} {else} {$account.4.outbound_proxy_secondary} @@ -3897,12 +3913,16 @@ +{if $account.5.sip_transport != 'dns srv'} {$account.5.server_address}:{$account.5.sip_port} +{else} + {$account.5.server_address} +{/if} -{if isset($account.5.server_address_secondary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.server_address_secondary)} {$account.5.server_address_secondary}:{$account.5.sip_port} {else} {$account.5.server_address_secondary} @@ -3911,7 +3931,7 @@ -{if isset($account.5.outbound_proxy_primary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_primary)} {$account.5.outbound_proxy_primary}:{$account.5.sip_port} {else} {$account.5.outbound_proxy_primary} @@ -3920,7 +3940,7 @@ -{if isset($account.5.outbound_proxy_secondary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_secondary)} {$account.5.outbound_proxy_secondary}:{$account.5.sip_port} {else} {$account.5.outbound_proxy_secondary} @@ -4846,7 +4866,7 @@ - {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} + 0 diff --git a/resources/templates/provision/grandstream/grp2616/{$mac}.xml b/resources/templates/provision/grandstream/grp2616/{$mac}.xml index b8be9608e0..7a6e28320c 100644 --- a/resources/templates/provision/grandstream/grp2616/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2616/{$mac}.xml @@ -27,12 +27,16 @@ +{if $account.1.sip_transport != 'dns srv'} {$account.1.server_address}:{$account.1.sip_port} +{else} + {$account.1.server_address} +{/if} -{if isset($account.1.server_address_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)} {$account.1.server_address_secondary}:{$account.1.sip_port} {else} {$account.1.server_address_secondary} @@ -41,7 +45,7 @@ -{if isset($account.1.outbound_proxy_primary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)} {$account.1.outbound_proxy_primary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_primary} @@ -50,7 +54,7 @@ -{if isset($account.1.outbound_proxy_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)} {$account.1.outbound_proxy_secondary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_secondary} @@ -985,12 +989,16 @@ +{if $account.2.sip_transport != 'dns srv'} {$account.2.server_address}:{$account.2.sip_port} +{else} + {$account.2.server_address} +{/if} -{if isset($account.2.server_address_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)} {$account.2.server_address_secondary}:{$account.2.sip_port} {else} {$account.2.server_address_secondary} @@ -999,7 +1007,7 @@ -{if isset($account.2.outbound_proxy_primary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)} {$account.2.outbound_proxy_primary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_primary} @@ -1008,7 +1016,7 @@ -{if isset($account.2.outbound_proxy_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)} {$account.2.outbound_proxy_secondary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_secondary} @@ -1934,12 +1942,16 @@ +{if $account.3.sip_transport != 'dns srv'} {$account.3.server_address}:{$account.3.sip_port} +{else} + {$account.3.server_address} +{/if} -{if isset($account.3.server_address_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)} {$account.3.server_address_secondary}:{$account.3.sip_port} {else} {$account.3.server_address_secondary} @@ -1948,7 +1960,7 @@ -{if isset($account.3.outbound_proxy_primary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)} {$account.3.outbound_proxy_primary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_primary} @@ -1957,7 +1969,7 @@ -{if isset($account.3.outbound_proxy_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)} {$account.3.outbound_proxy_secondary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_secondary} @@ -2882,12 +2894,16 @@ +{if $account.4.sip_transport != 'dns srv'} {$account.4.server_address}:{$account.4.sip_port} +{else} + {$account.4.server_address} +{/if} -{if isset($account.4.server_address_secondary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.server_address_secondary)} {$account.4.server_address_secondary}:{$account.4.sip_port} {else} {$account.4.server_address_secondary} @@ -2896,7 +2912,7 @@ -{if isset($account.4.outbound_proxy_primary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_primary)} {$account.4.outbound_proxy_primary}:{$account.4.sip_port} {else} {$account.4.outbound_proxy_primary} @@ -2905,7 +2921,7 @@ -{if isset($account.4.outbound_proxy_secondary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_secondary)} {$account.4.outbound_proxy_secondary}:{$account.4.sip_port} {else} {$account.4.outbound_proxy_secondary} @@ -3833,12 +3849,16 @@ +{if $account.5.sip_transport != 'dns srv'} {$account.5.server_address}:{$account.5.sip_port} +{else} + {$account.5.server_address} +{/if} -{if isset($account.5.server_address_secondary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.server_address_secondary)} {$account.5.server_address_secondary}:{$account.5.sip_port} {else} {$account.5.server_address_secondary} @@ -3847,7 +3867,7 @@ -{if isset($account.5.outbound_proxy_primary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_primary)} {$account.5.outbound_proxy_primary}:{$account.5.sip_port} {else} {$account.5.outbound_proxy_primary} @@ -3856,7 +3876,7 @@ -{if isset($account.5.outbound_proxy_secondary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_secondary)} {$account.5.outbound_proxy_secondary}:{$account.5.sip_port} {else} {$account.5.outbound_proxy_secondary} @@ -4781,12 +4801,16 @@ +{if $account.6.sip_transport != 'dns srv'} {$account.6.server_address}:{$account.6.sip_port} +{else} + {$account.6.server_address} +{/if} -{if isset($account.6.server_address_secondary)} +{if $account.6.sip_transport != 'dns srv' && isset($account.6.server_address_secondary)} {$account.6.server_address_secondary}:{$account.6.sip_port} {else} {$account.6.server_address_secondary} @@ -4795,7 +4819,7 @@ -{if isset($account.6.outbound_proxy_primary)} +{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_primary)} {$account.6.outbound_proxy_primary}:{$account.6.sip_port} {else} {$account.6.outbound_proxy_primary} @@ -4804,7 +4828,7 @@ -{if isset($account.6.outbound_proxy_secondary)} +{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_secondary)} {$account.5.outbound_proxy_secondary}:{$account.6.sip_port} {else} {$account.6.outbound_proxy_secondary} @@ -5716,7 +5740,7 @@ - {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} + 0 diff --git a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml index 6a770d47d2..acfacb9e22 100644 --- a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml @@ -27,12 +27,16 @@ +{if $account.1.sip_transport != 'dns srv'} {$account.1.server_address}:{$account.1.sip_port} +{else} + {$account.1.server_address} +{/if} -{if isset($account.1.server_address_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)} {$account.1.server_address_secondary}:{$account.1.sip_port} {else} {$account.1.server_address_secondary} @@ -41,7 +45,7 @@ -{if isset($account.1.outbound_proxy_primary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)} {$account.1.outbound_proxy_primary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_primary} @@ -50,7 +54,7 @@ -{if isset($account.1.outbound_proxy_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)} {$account.1.outbound_proxy_secondary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_secondary} @@ -1004,12 +1008,16 @@ +{if $account.2.sip_transport != 'dns srv'} {$account.2.server_address}:{$account.2.sip_port} +{else} + {$account.2.server_address} +{/if} -{if isset($account.2.server_address_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)} {$account.2.server_address_secondary}:{$account.2.sip_port} {else} {$account.2.server_address_secondary} @@ -1018,7 +1026,7 @@ -{if isset($account.2.outbound_proxy_primary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)} {$account.2.outbound_proxy_primary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_primary} @@ -1027,7 +1035,7 @@ -{if isset($account.2.outbound_proxy_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)} {$account.2.outbound_proxy_secondary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_secondary} @@ -1973,12 +1981,16 @@ +{if $account.3.sip_transport != 'dns srv'} {$account.3.server_address}:{$account.3.sip_port} +{else} + {$account.3.server_address} +{/if} -{if isset($account.3.server_address_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)} {$account.3.server_address_secondary}:{$account.3.sip_port} {else} {$account.3.server_address_secondary} @@ -1987,7 +1999,7 @@ -{if isset($account.3.outbound_proxy_primary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)} {$account.3.outbound_proxy_primary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_primary} @@ -1996,7 +2008,7 @@ -{if isset($account.3.outbound_proxy_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)} {$account.3.outbound_proxy_secondary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_secondary} @@ -2941,12 +2953,16 @@ +{if $account.4.sip_transport != 'dns srv'} {$account.4.server_address}:{$account.4.sip_port} +{else} + {$account.4.server_address} +{/if} -{if isset($account.4.server_address_secondary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.server_address_secondary)} {$account.4.server_address_secondary}:{$account.4.sip_port} {else} {$account.4.server_address_secondary} @@ -2955,7 +2971,7 @@ -{if isset($account.4.outbound_proxy_primary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_primary)} {$account.4.outbound_proxy_primary}:{$account.4.sip_port} {else} {$account.4.outbound_proxy_primary} @@ -2964,7 +2980,7 @@ -{if isset($account.4.outbound_proxy_secondary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_secondary)} {$account.4.outbound_proxy_secondary}:{$account.4.sip_port} {else} {$account.4.outbound_proxy_secondary} @@ -3912,12 +3928,16 @@ +{if $account.5.sip_transport != 'dns srv'} {$account.5.server_address}:{$account.5.sip_port} +{else} + {$account.5.server_address} +{/if} -{if isset($account.5.server_address_secondary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.server_address_secondary)} {$account.5.server_address_secondary}:{$account.5.sip_port} {else} {$account.5.server_address_secondary} @@ -3926,7 +3946,7 @@ -{if isset($account.5.outbound_proxy_primary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_primary)} {$account.5.outbound_proxy_primary}:{$account.5.sip_port} {else} {$account.5.outbound_proxy_primary} @@ -3935,7 +3955,7 @@ -{if isset($account.5.outbound_proxy_secondary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_secondary)} {$account.5.outbound_proxy_secondary}:{$account.5.sip_port} {else} {$account.5.outbound_proxy_secondary} @@ -4868,7 +4888,7 @@ - {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} + 2 diff --git a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml index 51ed8c3b88..ecb28b3e4c 100644 --- a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml @@ -684,7 +684,7 @@ -{if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} +0 diff --git a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml index 9069b3272f..82ff771ac4 100644 --- a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml @@ -554,7 +554,7 @@ -{if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} +0 diff --git a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml index 03fcc26fa6..d4f246777a 100644 --- a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml @@ -1000,7 +1000,7 @@ - {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} + 0 diff --git a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml index b3974b0d2f..6a4f2a6822 100644 --- a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml @@ -1000,7 +1000,7 @@ - {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} + 0 diff --git a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml index fd521edfb7..01cf12a222 100644 --- a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml @@ -1313,7 +1313,7 @@ -{if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} +0 diff --git a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml index c893fc4fd3..38828c6035 100644 --- a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml @@ -1122,7 +1122,7 @@ -{if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} +0 diff --git a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml index c29799eea5..6efccdb3cc 100644 --- a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml @@ -27,11 +27,15 @@ {$account.1.display_name} +{if $account.1.sip_transport != 'dns srv'} {$account.1.server_address}:{$account.1.sip_port} +{else} +{$account.1.server_address} +{/if} -{if isset($account.1.server_address_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)} {$account.1.server_address_secondary}:{$account.1.sip_port} {else} {$account.1.server_address_secondary} @@ -40,7 +44,7 @@ -{if isset($account.1.outbound_proxy_primary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)} {$account.1.outbound_proxy_primary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_primary} @@ -49,7 +53,7 @@ -{if isset($account.1.outbound_proxy_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)} {$account.1.outbound_proxy_secondary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_secondary} @@ -629,12 +633,16 @@ {$account.2.display_name} +{if $account.2.sip_transport != 'dns srv'} {$account.2.server_address}:{$account.2.sip_port} +{else} +{$account.2.server_address} +{/if} -{if isset($account.2.server_address_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)} {$account.2.server_address_secondary}:{$account.2.sip_port} {else} {$account.2.server_address_secondary} @@ -643,7 +651,7 @@ -{if isset($account.2.outbound_proxy_primary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)} {$account.2.outbound_proxy_primary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_primary} @@ -652,7 +660,7 @@ -{if isset($account.2.outbound_proxy_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)} {$account.2.outbound_proxy_secondary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_secondary} @@ -1212,12 +1220,16 @@ +{if $account.3.sip_transport != 'dns srv'} {$account.3.server_address}:{$account.3.sip_port} +{else} +{$account.3.server_address} +{/if} -{if isset($account.3.server_address_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)} {$account.3.server_address_secondary}:{$account.3.sip_port} {else} {$account.3.server_address_secondary} @@ -1226,7 +1238,7 @@ -{if isset($account.3.outbound_proxy_primary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)} {$account.3.outbound_proxy_primary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_primary} @@ -1235,7 +1247,7 @@ -{if isset($account.3.outbound_proxy_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)} {$account.3.outbound_proxy_secondary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_secondary} @@ -1780,7 +1792,7 @@ -{if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} +0 diff --git a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml index 812044fc97..86e99e4b61 100644 --- a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml @@ -773,7 +773,11 @@ +{if $account.1.sip_transport != 'dns srv'} {$account.1.server_address}:{$account.1.sip_port} +{else} +{$account.1.server_address} +{/if} @@ -781,7 +785,7 @@ -{if isset($account.1.outbound_proxy_primary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)} {$account.1.outbound_proxy_primary}:{$account.1.sip_port} {else} @@ -789,7 +793,7 @@ -{if isset($account.1.outbound_proxy_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)} {$account.1.outbound_proxy_secondary}:{$account.1.sip_port} {else} @@ -1484,7 +1488,11 @@ +{if $account.2.sip_transport != 'dns srv'} {$account.2.server_address}:{$account.2.sip_port} +{else} +{$account.2.server_address} +{/if} @@ -1492,7 +1500,7 @@ -{if isset($account.2.outbound_proxy_primary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)} {$account.2.outbound_proxy_primary}:{$account.2.sip_port} {else} @@ -1500,7 +1508,7 @@ -{if isset($account.2.outbound_proxy_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)} {$account.2.outbound_proxy_secondary}:{$account.2.sip_port} {else} @@ -2184,7 +2192,11 @@ +{if $account.3.sip_transport != 'dns srv'} {$account.3.server_address}:{$account.3.sip_port} +{else} +{$account.3.server_address} +{/if} @@ -2192,7 +2204,7 @@ -{if isset($account.3.outbound_proxy_primary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)} {$account.3.outbound_proxy_primary}:{$account.3.sip_port} {else} @@ -2200,7 +2212,7 @@ -{if isset($account.3.outbound_proxy_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)} {$account.3.outbound_proxy_secondary}:{$account.3.sip_port} {else} @@ -5806,7 +5818,7 @@ -{if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} +0 diff --git a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml index 33e0d419e3..4dea5864c1 100644 --- a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml @@ -2520,7 +2520,7 @@ - {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} + 0 diff --git a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml index fc120a10a9..af6c6bcab0 100644 --- a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml @@ -1737,7 +1737,7 @@ - {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} + 0 diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml index 6b49a43693..b968967f98 100644 --- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml @@ -27,12 +27,16 @@ +{if $account.1.sip_transport != 'dns srv'} {$account.1.server_address}:{$account.1.sip_port} +{else} + {$account.1.server_address} +{/if} -{if isset($account.1.server_address_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)} {$account.1.server_address_secondary}:{$account.1.sip_port} {else} {$account.1.server_address_secondary} @@ -41,7 +45,7 @@ -{if isset($account.1.outbound_proxy_primary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)} {$account.1.outbound_proxy_primary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_primary} @@ -50,7 +54,7 @@ -{if isset($account.1.outbound_proxy_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)} {$account.1.outbound_proxy_secondary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_secondary} @@ -989,12 +993,16 @@ +{if $account.2.sip_transport != 'dns srv'} {$account.2.server_address}:{$account.2.sip_port} +{else} + {$account.2.server_address} +{/if} -{if isset($account.2.server_address_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)} {$account.2.server_address_secondary}:{$account.2.sip_port} {else} {$account.2.server_address_secondary} @@ -1003,7 +1011,7 @@ -{if isset($account.2.outbound_proxy_primary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)} {$account.2.outbound_proxy_primary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_primary} @@ -1012,7 +1020,7 @@ -{if isset($account.2.outbound_proxy_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)} {$account.2.outbound_proxy_secondary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_secondary} @@ -1938,12 +1946,16 @@ +{if $account.3.sip_transport != 'dns srv'} {$account.3.server_address}:{$account.3.sip_port} +{else} + {$account.3.server_address} +{/if} -{if isset($account.3.server_address_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)} {$account.3.server_address_secondary}:{$account.3.sip_port} {else} {$account.3.server_address_secondary} @@ -1952,7 +1964,7 @@ -{if isset($account.3.outbound_proxy_primary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)} {$account.3.outbound_proxy_primary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_primary} @@ -1961,7 +1973,7 @@ -{if isset($account.3.outbound_proxy_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)} {$account.3.outbound_proxy_secondary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_secondary} @@ -2886,12 +2898,16 @@ +{if $account.4.sip_transport != 'dns srv'} {$account.4.server_address}:{$account.4.sip_port} +{else} + {$account.4.server_address} +{/if} -{if isset($account.4.server_address_secondary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.server_address_secondary)} {$account.4.server_address_secondary}:{$account.4.sip_port} {else} {$account.4.server_address_secondary} @@ -2900,7 +2916,7 @@ -{if isset($account.4.outbound_proxy_primary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_primary)} {$account.4.outbound_proxy_primary}:{$account.4.sip_port} {else} {$account.4.outbound_proxy_primary} @@ -2909,7 +2925,7 @@ -{if isset($account.4.outbound_proxy_secondary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_secondary)} {$account.4.outbound_proxy_secondary}:{$account.4.sip_port} {else} {$account.4.outbound_proxy_secondary} @@ -3837,12 +3853,16 @@ +{if $account.5.sip_transport != 'dns srv'} {$account.5.server_address}:{$account.5.sip_port} +{else} + {$account.5.server_address} +{/if} -{if isset($account.5.server_address_secondary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.server_address_secondary)} {$account.5.server_address_secondary}:{$account.5.sip_port} {else} {$account.5.server_address_secondary} @@ -3851,7 +3871,7 @@ -{if isset($account.5.outbound_proxy_primary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_primary)} {$account.5.outbound_proxy_primary}:{$account.5.sip_port} {else} {$account.5.outbound_proxy_primary} @@ -3860,7 +3880,7 @@ -{if isset($account.5.outbound_proxy_secondary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_secondary)} {$account.5.outbound_proxy_secondary}:{$account.5.sip_port} {else} {$account.5.outbound_proxy_secondary} @@ -4785,12 +4805,16 @@ +{if $account.6.sip_transport != 'dns srv'} {$account.6.server_address}:{$account.6.sip_port} +{else} + {$account.6.server_address} +{/if} -{if isset($account.6.server_address_secondary)} +{if $account.6.sip_transport != 'dns srv' && isset($account.6.server_address_secondary)} {$account.6.server_address_secondary}:{$account.6.sip_port} {else} {$account.6.server_address_secondary} @@ -4799,7 +4823,7 @@ -{if isset($account.6.outbound_proxy_primary)} +{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_primary)} {$account.6.outbound_proxy_primary}:{$account.6.sip_port} {else} {$account.6.outbound_proxy_primary} @@ -4808,7 +4832,7 @@ -{if isset($account.6.outbound_proxy_secondary)} +{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_secondary)} {$account.5.outbound_proxy_secondary}:{$account.6.sip_port} {else} {$account.6.outbound_proxy_secondary} @@ -5720,7 +5744,7 @@ - {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} + 0 diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml index f3d420b5d1..fbc9308df5 100644 --- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml @@ -27,12 +27,16 @@ +{if $account.1.sip_transport != 'dns srv'} {$account.1.server_address}:{$account.1.sip_port} +{else} + {$account.1.server_address} +{/if} -{if isset($account.1.server_address_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)} {$account.1.server_address_secondary}:{$account.1.sip_port} {else} {$account.1.server_address_secondary} @@ -41,7 +45,7 @@ -{if isset($account.1.outbound_proxy_primary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)} {$account.1.outbound_proxy_primary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_primary} @@ -50,7 +54,7 @@ -{if isset($account.1.outbound_proxy_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)} {$account.1.outbound_proxy_secondary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_secondary} @@ -989,12 +993,16 @@ +{if $account.2.sip_transport != 'dns srv'} {$account.2.server_address}:{$account.2.sip_port} +{else} + {$account.2.server_address} +{/if} -{if isset($account.2.server_address_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)} {$account.2.server_address_secondary}:{$account.2.sip_port} {else} {$account.2.server_address_secondary} @@ -1003,7 +1011,7 @@ -{if isset($account.2.outbound_proxy_primary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)} {$account.2.outbound_proxy_primary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_primary} @@ -1012,7 +1020,7 @@ -{if isset($account.2.outbound_proxy_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)} {$account.2.outbound_proxy_secondary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_secondary} @@ -1938,12 +1946,16 @@ +{if $account.3.sip_transport != 'dns srv'} {$account.3.server_address}:{$account.3.sip_port} +{else} + {$account.3.server_address} +{/if} -{if isset($account.3.server_address_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)} {$account.3.server_address_secondary}:{$account.3.sip_port} {else} {$account.3.server_address_secondary} @@ -1952,7 +1964,7 @@ -{if isset($account.3.outbound_proxy_primary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)} {$account.3.outbound_proxy_primary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_primary} @@ -1961,7 +1973,7 @@ -{if isset($account.3.outbound_proxy_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)} {$account.3.outbound_proxy_secondary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_secondary} @@ -2886,12 +2898,16 @@ +{if $account.4.sip_transport != 'dns srv'} {$account.4.server_address}:{$account.4.sip_port} +{else} + {$account.4.server_address} +{/if} -{if isset($account.4.server_address_secondary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.server_address_secondary)} {$account.4.server_address_secondary}:{$account.4.sip_port} {else} {$account.4.server_address_secondary} @@ -2900,7 +2916,7 @@ -{if isset($account.4.outbound_proxy_primary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_primary)} {$account.4.outbound_proxy_primary}:{$account.4.sip_port} {else} {$account.4.outbound_proxy_primary} @@ -2909,7 +2925,7 @@ -{if isset($account.4.outbound_proxy_secondary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_secondary)} {$account.4.outbound_proxy_secondary}:{$account.4.sip_port} {else} {$account.4.outbound_proxy_secondary} @@ -3837,12 +3853,16 @@ +{if $account.5.sip_transport != 'dns srv'} {$account.5.server_address}:{$account.5.sip_port} +{else} + {$account.5.server_address} +{/if} -{if isset($account.5.server_address_secondary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_secondary)} {$account.5.server_address_secondary}:{$account.5.sip_port} {else} {$account.5.server_address_secondary} @@ -3851,7 +3871,7 @@ -{if isset($account.5.outbound_proxy_primary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_primary)} {$account.5.outbound_proxy_primary}:{$account.5.sip_port} {else} {$account.5.outbound_proxy_primary} @@ -3860,7 +3880,7 @@ -{if isset($account.5.outbound_proxy_secondary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_secondary)} {$account.5.outbound_proxy_secondary}:{$account.5.sip_port} {else} {$account.5.outbound_proxy_secondary} @@ -4785,12 +4805,16 @@ +{if $account.6.sip_transport != 'dns srv'} {$account.6.server_address}:{$account.6.sip_port} +{else} + {$account.6.server_address} +{/if} -{if isset($account.6.server_address_secondary)} +{if $account.6.sip_transport != 'dns srv' && isset($account.6.server_address_secondary)} {$account.6.server_address_secondary}:{$account.6.sip_port} {else} {$account.6.server_address_secondary} @@ -4799,7 +4823,7 @@ -{if isset($account.6.outbound_proxy_primary)} +{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_primary)} {$account.6.outbound_proxy_primary}:{$account.6.sip_port} {else} {$account.6.outbound_proxy_primary} @@ -4808,7 +4832,7 @@ -{if isset($account.6.outbound_proxy_secondary)} +{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_secondary)} {$account.5.outbound_proxy_secondary}:{$account.6.sip_port} {else} {$account.6.outbound_proxy_secondary} @@ -5720,8 +5744,7 @@ - {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} - + 0 diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml index 1013d302e8..8c8108c20b 100644 --- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml @@ -27,12 +27,16 @@ +{if $account.1.sip_transport != 'dns srv'} {$account.1.server_address}:{$account.1.sip_port} +{else} + {$account.1.server_address} +{/if} -{if isset($account.1.server_address_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)} {$account.1.server_address_secondary}:{$account.1.sip_port} {else} {$account.1.server_address_secondary} @@ -41,7 +45,7 @@ -{if isset($account.1.outbound_proxy_primary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)} {$account.1.outbound_proxy_primary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_primary} @@ -50,7 +54,7 @@ -{if isset($account.1.outbound_proxy_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)} {$account.1.outbound_proxy_secondary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_secondary} @@ -989,12 +993,16 @@ +{if $account.2.sip_transport != 'dns srv'} {$account.2.server_address}:{$account.2.sip_port} +{else} + {$account.2.server_address} +{/if} -{if isset($account.2.server_address_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)} {$account.2.server_address_secondary}:{$account.2.sip_port} {else} {$account.2.server_address_secondary} @@ -1003,7 +1011,7 @@ -{if isset($account.2.outbound_proxy_primary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)} {$account.2.outbound_proxy_primary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_primary} @@ -1012,7 +1020,7 @@ -{if isset($account.2.outbound_proxy_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)} {$account.2.outbound_proxy_secondary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_secondary} @@ -1938,12 +1946,16 @@ +{if $account.3.sip_transport != 'dns srv'} {$account.3.server_address}:{$account.3.sip_port} +{else} + {$account.3.server_address} +{/if} -{if isset($account.3.server_address_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)} {$account.3.server_address_secondary}:{$account.3.sip_port} {else} {$account.3.server_address_secondary} @@ -1952,7 +1964,7 @@ -{if isset($account.3.outbound_proxy_primary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)} {$account.3.outbound_proxy_primary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_primary} @@ -1961,7 +1973,7 @@ -{if isset($account.3.outbound_proxy_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)} {$account.3.outbound_proxy_secondary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_secondary} @@ -2886,12 +2898,16 @@ +{if $account.4.sip_transport != 'dns srv'} {$account.4.server_address}:{$account.4.sip_port} +{else} + {$account.4.server_address} +{/if} -{if isset($account.4.server_address_secondary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.server_address_secondary)} {$account.4.server_address_secondary}:{$account.4.sip_port} {else} {$account.4.server_address_secondary} @@ -2900,7 +2916,7 @@ -{if isset($account.4.outbound_proxy_primary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_primary)} {$account.4.outbound_proxy_primary}:{$account.4.sip_port} {else} {$account.4.outbound_proxy_primary} @@ -2909,7 +2925,7 @@ -{if isset($account.4.outbound_proxy_secondary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_secondary)} {$account.4.outbound_proxy_secondary}:{$account.4.sip_port} {else} {$account.4.outbound_proxy_secondary} @@ -3837,12 +3853,16 @@ +{if $account.5.sip_transport != 'dns srv'} {$account.5.server_address}:{$account.5.sip_port} +{else} + {$account.5.server_address} +{/if} -{if isset($account.5.server_address_secondary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.server_address_secondary)} {$account.5.server_address_secondary}:{$account.5.sip_port} {else} {$account.5.server_address_secondary} @@ -3851,7 +3871,7 @@ -{if isset($account.5.outbound_proxy_primary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_primary)} {$account.5.outbound_proxy_primary}:{$account.5.sip_port} {else} {$account.5.outbound_proxy_primary} @@ -3860,7 +3880,7 @@ -{if isset($account.5.outbound_proxy_secondary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_secondary)} {$account.5.outbound_proxy_secondary}:{$account.5.sip_port} {else} {$account.5.outbound_proxy_secondary} @@ -4785,12 +4805,16 @@ +{if $account.6.sip_transport != 'dns srv'} {$account.6.server_address}:{$account.6.sip_port} +{else} + {$account.6.server_address} +{/if} -{if isset($account.6.server_address_secondary)} +{if $account.6.sip_transport != 'dns srv' && isset($account.6.server_address_secondary)} {$account.6.server_address_secondary}:{$account.6.sip_port} {else} {$account.6.server_address_secondary} @@ -4799,7 +4823,7 @@ -{if isset($account.6.outbound_proxy_primary)} +{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_primary)} {$account.6.outbound_proxy_primary}:{$account.6.sip_port} {else} {$account.6.outbound_proxy_primary} @@ -4808,7 +4832,7 @@ -{if isset($account.6.outbound_proxy_secondary)} +{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_secondary)} {$account.5.outbound_proxy_secondary}:{$account.6.sip_port} {else} {$account.6.outbound_proxy_secondary} @@ -5720,7 +5744,7 @@ - {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} + 0 diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml index 0fd095b8bc..7c2c94e6f6 100644 --- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml @@ -27,12 +27,16 @@ +{if $account.1.sip_transport != 'dns srv'} {$account.1.server_address}:{$account.1.sip_port} +{else} + {$account.1.server_address} +{/if} -{if isset($account.1.server_address_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)} {$account.1.server_address_secondary}:{$account.1.sip_port} {else} {$account.1.server_address_secondary} @@ -41,7 +45,7 @@ -{if isset($account.1.outbound_proxy_primary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)} {$account.1.outbound_proxy_primary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_primary} @@ -50,7 +54,7 @@ -{if isset($account.1.outbound_proxy_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)} {$account.1.outbound_proxy_secondary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_secondary} @@ -989,12 +993,16 @@ +{if $account.2.sip_transport != 'dns srv'} {$account.2.server_address}:{$account.2.sip_port} +{else} + {$account.2.server_address} +{/if} -{if isset($account.2.server_address_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)} {$account.2.server_address_secondary}:{$account.2.sip_port} {else} {$account.2.server_address_secondary} @@ -1003,7 +1011,7 @@ -{if isset($account.2.outbound_proxy_primary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)} {$account.2.outbound_proxy_primary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_primary} @@ -1012,7 +1020,7 @@ -{if isset($account.2.outbound_proxy_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)} {$account.2.outbound_proxy_secondary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_secondary} @@ -1938,12 +1946,16 @@ +{if $account.3.sip_transport != 'dns srv'} {$account.3.server_address}:{$account.3.sip_port} +{else} + {$account.3.server_address} +{/if} -{if isset($account.3.server_address_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)} {$account.3.server_address_secondary}:{$account.3.sip_port} {else} {$account.3.server_address_secondary} @@ -1952,7 +1964,7 @@ -{if isset($account.3.outbound_proxy_primary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)} {$account.3.outbound_proxy_primary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_primary} @@ -1961,7 +1973,7 @@ -{if isset($account.3.outbound_proxy_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)} {$account.3.outbound_proxy_secondary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_secondary} @@ -2886,12 +2898,16 @@ +{if $account.4.sip_transport != 'dns srv'} {$account.4.server_address}:{$account.4.sip_port} +{else} + {$account.4.server_address} +{/if} -{if isset($account.4.server_address_secondary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.server_address_secondary)} {$account.4.server_address_secondary}:{$account.4.sip_port} {else} {$account.4.server_address_secondary} @@ -2900,7 +2916,7 @@ -{if isset($account.4.outbound_proxy_primary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_primary)} {$account.4.outbound_proxy_primary}:{$account.4.sip_port} {else} {$account.4.outbound_proxy_primary} @@ -2909,7 +2925,7 @@ -{if isset($account.4.outbound_proxy_secondary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_secondary)} {$account.4.outbound_proxy_secondary}:{$account.4.sip_port} {else} {$account.4.outbound_proxy_secondary} @@ -3837,12 +3853,16 @@ +{if $account.5.sip_transport != 'dns srv'} {$account.5.server_address}:{$account.5.sip_port} +{else} + {$account.5.server_address} +{/if} -{if isset($account.5.server_address_secondary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.server_address_secondary)} {$account.5.server_address_secondary}:{$account.5.sip_port} {else} {$account.5.server_address_secondary} @@ -3851,7 +3871,7 @@ -{if isset($account.5.outbound_proxy_primary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_primary)} {$account.5.outbound_proxy_primary}:{$account.5.sip_port} {else} {$account.5.outbound_proxy_primary} @@ -3860,7 +3880,7 @@ -{if isset($account.5.outbound_proxy_secondary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_secondary)} {$account.5.outbound_proxy_secondary}:{$account.5.sip_port} {else} {$account.5.outbound_proxy_secondary} @@ -4785,12 +4805,16 @@ +{if $account.6.sip_transport != 'dns srv'} {$account.6.server_address}:{$account.6.sip_port} +{else} + {$account.6.server_address} +{/if} -{if isset($account.6.server_address_secondary)} +{if $account.6.sip_transport != 'dns srv' && isset($account.6.server_address_secondary)} {$account.6.server_address_secondary}:{$account.6.sip_port} {else} {$account.6.server_address_secondary} @@ -4799,7 +4823,7 @@ -{if isset($account.6.outbound_proxy_primary)} +{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_primary)} {$account.6.outbound_proxy_primary}:{$account.6.sip_port} {else} {$account.6.outbound_proxy_primary} @@ -4808,7 +4832,7 @@ -{if isset($account.6.outbound_proxy_secondary)} +{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_secondary)} {$account.5.outbound_proxy_secondary}:{$account.6.sip_port} {else} {$account.6.outbound_proxy_secondary} @@ -5720,7 +5744,7 @@ - {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} + 0 diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml index af8f1522f4..31f531b988 100644 --- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml @@ -27,12 +27,16 @@ +{if $account.1.sip_transport != 'dns srv'} {$account.1.server_address}:{$account.1.sip_port} +{else} + {$account.1.server_address} +{/if} -{if isset($account.1.server_address_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)} {$account.1.server_address_secondary}:{$account.1.sip_port} {else} {$account.1.server_address_secondary} @@ -41,7 +45,7 @@ -{if isset($account.1.outbound_proxy_primary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)} {$account.1.outbound_proxy_primary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_primary} @@ -50,7 +54,7 @@ -{if isset($account.1.outbound_proxy_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)} {$account.1.outbound_proxy_secondary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_secondary} @@ -989,12 +993,16 @@ +{if $account.2.sip_transport != 'dns srv'} {$account.2.server_address}:{$account.2.sip_port} +{else} + {$account.2.server_address} +{/if} -{if isset($account.2.server_address_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)} {$account.2.server_address_secondary}:{$account.2.sip_port} {else} {$account.2.server_address_secondary} @@ -1003,7 +1011,7 @@ -{if isset($account.2.outbound_proxy_primary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)} {$account.2.outbound_proxy_primary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_primary} @@ -1012,7 +1020,7 @@ -{if isset($account.2.outbound_proxy_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)} {$account.2.outbound_proxy_secondary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_secondary} @@ -1938,12 +1946,16 @@ +{if $account.3.sip_transport != 'dns srv'} {$account.3.server_address}:{$account.3.sip_port} +{else} + {$account.3.server_address} +{/if} -{if isset($account.3.server_address_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.server_address_secondary)} {$account.3.server_address_secondary}:{$account.3.sip_port} {else} {$account.3.server_address_secondary} @@ -1952,7 +1964,7 @@ -{if isset($account.3.outbound_proxy_primary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)} {$account.3.outbound_proxy_primary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_primary} @@ -1961,7 +1973,7 @@ -{if isset($account.3.outbound_proxy_secondary)} +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)} {$account.3.outbound_proxy_secondary}:{$account.3.sip_port} {else} {$account.3.outbound_proxy_secondary} @@ -2886,12 +2898,16 @@ +{if $account.4.sip_transport != 'dns srv'} {$account.4.server_address}:{$account.4.sip_port} +{else} + {$account.4.server_address} +{/if} -{if isset($account.4.server_address_secondary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.server_address_secondary)} {$account.4.server_address_secondary}:{$account.4.sip_port} {else} {$account.4.server_address_secondary} @@ -2900,7 +2916,7 @@ -{if isset($account.4.outbound_proxy_primary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_primary)} {$account.4.outbound_proxy_primary}:{$account.4.sip_port} {else} {$account.4.outbound_proxy_primary} @@ -2909,7 +2925,7 @@ -{if isset($account.4.outbound_proxy_secondary)} +{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_secondary)} {$account.4.outbound_proxy_secondary}:{$account.4.sip_port} {else} {$account.4.outbound_proxy_secondary} @@ -3837,12 +3853,16 @@ +{if $account.5.sip_transport != 'dns srv'} {$account.5.server_address}:{$account.5.sip_port} +{else} + {$account.5.server_address} +{/if} -{if isset($account.5.server_address_secondary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.server_address_secondary)} {$account.5.server_address_secondary}:{$account.5.sip_port} {else} {$account.5.server_address_secondary} @@ -3851,7 +3871,7 @@ -{if isset($account.5.outbound_proxy_primary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_primary)} {$account.5.outbound_proxy_primary}:{$account.5.sip_port} {else} {$account.5.outbound_proxy_primary} @@ -3860,7 +3880,7 @@ -{if isset($account.5.outbound_proxy_secondary)} +{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_secondary)} {$account.5.outbound_proxy_secondary}:{$account.5.sip_port} {else} {$account.5.outbound_proxy_secondary} @@ -4785,12 +4805,16 @@ +{if $account.6.sip_transport != 'dns srv'} {$account.6.server_address}:{$account.6.sip_port} +{else} + {$account.6.server_address} +{/if} -{if isset($account.6.server_address_secondary)} +{if $account.6.sip_transport != 'dns srv' && isset($account.6.server_address_secondary)} {$account.6.server_address_secondary}:{$account.6.sip_port} {else} {$account.6.server_address_secondary} @@ -4799,7 +4823,7 @@ -{if isset($account.6.outbound_proxy_primary)} +{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_primary)} {$account.6.outbound_proxy_primary}:{$account.6.sip_port} {else} {$account.6.outbound_proxy_primary} @@ -4808,7 +4832,7 @@ -{if isset($account.6.outbound_proxy_secondary)} +{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_secondary)} {$account.5.outbound_proxy_secondary}:{$account.6.sip_port} {else} {$account.6.outbound_proxy_secondary} @@ -5720,7 +5744,7 @@ - {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} + 0 diff --git a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml index 99af016147..dc666c3d41 100644 --- a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml @@ -2532,7 +2532,7 @@ - {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} + 0 diff --git a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml index 4e91560712..d3eec5cb12 100644 --- a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml @@ -4393,7 +4393,7 @@ -{if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} +0 diff --git a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml index 350d555608..826a49bc7d 100644 --- a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml @@ -516,7 +516,11 @@ +{if $account.1.sip_transport != 'dns srv'} {$account.1.server_address}:{$account.1.sip_port} +{else} +{$account.1.server_address} +{/if} @@ -530,7 +534,7 @@ -{if isset($account.1.outbound_proxy_primary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)} {$account.1.outbound_proxy_primary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_primary} diff --git a/resources/templates/provision/grandstream/ht801/{$mac}.xml b/resources/templates/provision/grandstream/ht801/{$mac}.xml index df654be25b..e6150054d8 100644 --- a/resources/templates/provision/grandstream/ht801/{$mac}.xml +++ b/resources/templates/provision/grandstream/ht801/{$mac}.xml @@ -536,7 +536,11 @@ +{if $account.1.sip_transport != 'dns srv'} {$account.1.server_address}:{$account.1.sip_port} +{else} +{$account.1.server_address} +{/if} diff --git a/resources/templates/provision/grandstream/ht802/{$mac}.xml b/resources/templates/provision/grandstream/ht802/{$mac}.xml index 7f4db0ab8d..96849e029e 100644 --- a/resources/templates/provision/grandstream/ht802/{$mac}.xml +++ b/resources/templates/provision/grandstream/ht802/{$mac}.xml @@ -536,7 +536,11 @@ +{if $account.1.sip_transport != 'dns srv'} {$account.1.server_address}:{$account.1.sip_port} +{else} +{$account.1.server_address} +{/if} @@ -1441,7 +1445,11 @@ +{if $account.2.sip_transport != 'dns srv'} {$account.2.server_address}:{$account.2.sip_port} +{else} +{$account.2.server_address} +{/if} @@ -2363,7 +2371,7 @@ - {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} + 2 diff --git a/resources/templates/provision/grandstream/ht818/{$mac}.xml b/resources/templates/provision/grandstream/ht818/{$mac}.xml index 625d8a49b2..88f170f8d4 100644 --- a/resources/templates/provision/grandstream/ht818/{$mac}.xml +++ b/resources/templates/provision/grandstream/ht818/{$mac}.xml @@ -1764,7 +1764,7 @@ - {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} + 2 diff --git a/resources/templates/provision/grandstream/wp820/{$mac}.xml b/resources/templates/provision/grandstream/wp820/{$mac}.xml index f513dabdd6..0f983ca56e 100644 --- a/resources/templates/provision/grandstream/wp820/{$mac}.xml +++ b/resources/templates/provision/grandstream/wp820/{$mac}.xml @@ -30,12 +30,16 @@ +{if $account.1.sip_transport != 'dns srv'} {$account.1.server_address}:{$account.1.sip_port} +{else} +{$account.1.server_address} +{/if} -{if isset($account.1.server_address_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.server_address_secondary)} {$account.1.server_address_secondary}:{$account.1.sip_port} {else} {$account.1.server_address_secondary} @@ -69,7 +73,7 @@ -{if isset($account.1.outbound_proxy_primary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)} {$account.1.outbound_proxy_primary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_primary} @@ -78,7 +82,7 @@ -{if isset($account.1.outbound_proxy_secondary)} +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)} {$account.1.outbound_proxy_secondary}:{$account.1.sip_port} {else} {$account.1.outbound_proxy_secondary} @@ -662,11 +666,15 @@ +{if $account.2.sip_transport != 'dns srv'} {$account.2.server_address}:{$account.2.sip_port} +{else} +{$account.2.server_address} +{/if} -{if isset($account.2.server_address_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.server_address_secondary)} {$account.2.server_address_secondary}:{$account.2.sip_port} {else} {$account.2.server_address_secondary} @@ -700,7 +708,7 @@ -{if isset($account.2.outbound_proxy_primary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)} {$account.2.outbound_proxy_primary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_primary} @@ -708,7 +716,7 @@ -{if isset($account.2.outbound_proxy_secondary)} +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)} {$account.2.outbound_proxy_secondary}:{$account.2.sip_port} {else} {$account.2.outbound_proxy_secondary} From 81fa1407933f10509c41be2643068b308ddb54f5 Mon Sep 17 00:00:00 2001 From: demonspork Date: Fri, 14 May 2021 16:51:56 -0500 Subject: [PATCH 2/2] Restore grandstream_ipv_mode changes Accidentally clobbered the grandstream_ipv_mode variable changes, putting them back. --- resources/templates/provision/grandstream/gac2500/{$mac}.xml | 2 +- resources/templates/provision/grandstream/grp2612/{$mac}.xml | 2 +- resources/templates/provision/grandstream/grp2612w/{$mac}.xml | 2 +- resources/templates/provision/grandstream/grp2613/{$mac}.xml | 2 +- resources/templates/provision/grandstream/grp2614/{$mac}.xml | 2 +- resources/templates/provision/grandstream/grp2615/{$mac}.xml | 2 +- resources/templates/provision/grandstream/grp2616/{$mac}.xml | 2 +- resources/templates/provision/grandstream/grp26xx/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp110x/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp116x/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp140x/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp1450/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp16xx/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp17xx/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp2100/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp2124/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp2130/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp2135/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp2140/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp2160/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp2170/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp21xx/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxv3240/{$mac}.xml | 2 +- resources/templates/provision/grandstream/ht801/{$mac}.xml | 2 +- resources/templates/provision/grandstream/ht802/{$mac}.xml | 2 +- resources/templates/provision/grandstream/ht818/{$mac}.xml | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/resources/templates/provision/grandstream/gac2500/{$mac}.xml b/resources/templates/provision/grandstream/gac2500/{$mac}.xml index 4762e5049b..d43098b3db 100644 --- a/resources/templates/provision/grandstream/gac2500/{$mac}.xml +++ b/resources/templates/provision/grandstream/gac2500/{$mac}.xml @@ -3771,7 +3771,7 @@ - 0 + {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/grp2612/{$mac}.xml b/resources/templates/provision/grandstream/grp2612/{$mac}.xml index 407907fb70..dbfe571a93 100644 --- a/resources/templates/provision/grandstream/grp2612/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2612/{$mac}.xml @@ -1927,7 +1927,7 @@ - 2 + {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml index 289a40ddca..dadda5b812 100644 --- a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml @@ -1927,7 +1927,7 @@ - 2 + {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/grp2613/{$mac}.xml b/resources/templates/provision/grandstream/grp2613/{$mac}.xml index 4494504b70..4c59aa8fdb 100644 --- a/resources/templates/provision/grandstream/grp2613/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2613/{$mac}.xml @@ -2879,7 +2879,7 @@ - 0 + {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/grp2614/{$mac}.xml b/resources/templates/provision/grandstream/grp2614/{$mac}.xml index bf4b837ff1..9b8bc65605 100644 --- a/resources/templates/provision/grandstream/grp2614/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2614/{$mac}.xml @@ -3834,7 +3834,7 @@ - 0 + {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/grp2615/{$mac}.xml b/resources/templates/provision/grandstream/grp2615/{$mac}.xml index 9884ea4be4..7107dd29fd 100644 --- a/resources/templates/provision/grandstream/grp2615/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2615/{$mac}.xml @@ -4866,7 +4866,7 @@ - 0 + {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/grp2616/{$mac}.xml b/resources/templates/provision/grandstream/grp2616/{$mac}.xml index 7a6e28320c..72be3c7a69 100644 --- a/resources/templates/provision/grandstream/grp2616/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2616/{$mac}.xml @@ -5740,7 +5740,7 @@ - 0 + {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml index acfacb9e22..c3350960fc 100644 --- a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml @@ -4888,7 +4888,7 @@ - 2 + {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml index ecb28b3e4c..51ed8c3b88 100644 --- a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml @@ -684,7 +684,7 @@ -0 +{if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml index 82ff771ac4..9069b3272f 100644 --- a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml @@ -554,7 +554,7 @@ -0 +{if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml index d4f246777a..03fcc26fa6 100644 --- a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml @@ -1000,7 +1000,7 @@ - 0 + {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml index 6a4f2a6822..b3974b0d2f 100644 --- a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml @@ -1000,7 +1000,7 @@ - 0 + {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml index 01cf12a222..fd521edfb7 100644 --- a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml @@ -1313,7 +1313,7 @@ -0 +{if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml index 38828c6035..c893fc4fd3 100644 --- a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml @@ -1122,7 +1122,7 @@ -0 +{if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml index 6efccdb3cc..ffacc1510a 100644 --- a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml @@ -1792,7 +1792,7 @@ -0 +{if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml index 86e99e4b61..bfb62b6b77 100644 --- a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml @@ -5818,7 +5818,7 @@ -0 +{if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml index 4dea5864c1..33e0d419e3 100644 --- a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml @@ -2520,7 +2520,7 @@ - 0 + {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml index af6c6bcab0..fc120a10a9 100644 --- a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml @@ -1737,7 +1737,7 @@ - 0 + {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml index b968967f98..c5615e3ffe 100644 --- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml @@ -5744,7 +5744,7 @@ - 0 + {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml index fbc9308df5..ae10e1ef0f 100644 --- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml @@ -5744,7 +5744,7 @@ - 0 + {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml index 8c8108c20b..512abbbd9e 100644 --- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml @@ -5744,7 +5744,7 @@ - 0 + {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml index 7c2c94e6f6..11089a69b8 100644 --- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml @@ -5744,7 +5744,7 @@ - 0 + {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml index 31f531b988..ccce52b8ee 100644 --- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml @@ -5744,7 +5744,7 @@ - 0 + {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml index dc666c3d41..99af016147 100644 --- a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml @@ -2532,7 +2532,7 @@ - 0 + {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml index d3eec5cb12..4e91560712 100644 --- a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml @@ -4393,7 +4393,7 @@ -0 +{if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/ht801/{$mac}.xml b/resources/templates/provision/grandstream/ht801/{$mac}.xml index e6150054d8..720faf2153 100644 --- a/resources/templates/provision/grandstream/ht801/{$mac}.xml +++ b/resources/templates/provision/grandstream/ht801/{$mac}.xml @@ -1804,7 +1804,7 @@ - 2 + {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/ht802/{$mac}.xml b/resources/templates/provision/grandstream/ht802/{$mac}.xml index 96849e029e..9b300803fb 100644 --- a/resources/templates/provision/grandstream/ht802/{$mac}.xml +++ b/resources/templates/provision/grandstream/ht802/{$mac}.xml @@ -2371,7 +2371,7 @@ - 2 + {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if} diff --git a/resources/templates/provision/grandstream/ht818/{$mac}.xml b/resources/templates/provision/grandstream/ht818/{$mac}.xml index 88f170f8d4..625d8a49b2 100644 --- a/resources/templates/provision/grandstream/ht818/{$mac}.xml +++ b/resources/templates/provision/grandstream/ht818/{$mac}.xml @@ -1764,7 +1764,7 @@ - 2 + {if isset($grandstream_ipv_mode)}{$grandstream_ipv_mode}{else}0{/if}