dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed gxp2170 template value register_timeout (#3074)

Browse Source 
* Adds distinctive ring for grandstream 2170 template

* Fixed Register Timeout in gxp2170

* Fix PC passthrough default vlan 1 to 0 (untagged)

* Fix more regressions in grandstream 2135/2170 templates

* correct typo in grandstream_nat_transversal variable in gxp2135 template

* Fix override user ring volume
This commit is contained in:
Jim Kusznir
2018-06-20 10:20:37 -06:00
committed by FusionPBX
parent 8bc161caa0
commit 9dfa53fec7
2 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/templates/provision/grandstream/gxp2135/{$mac}.xml
+18 -18
View File
@@ -100,8 +100,8 @@
<!-- NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0. --> <!-- NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0. -->
<!-- Number: 0, 1, 2, 3, 4, 5 --> <!-- Number: 0, 1, 2, 3, 4, 5 -->
<!-- Mandatory --> <!-- Mandatory -->
{if isset($nat_traversal_1) } {if isset($grandstream_nat_traversal_1) }
<P52>{$nat_traversal_1}</P52> <P52>{$grandstream_nat_traversal_1}</P52>
{else} {else}
<P52>0</P52> <P52>0</P52>
{/if} {/if}
@@ -131,7 +131,7 @@
<!-- Register Expiration (in minutes). Default is 60. Max about 45 days --> <!-- Register Expiration (in minutes). Default is 60. Max about 45 days -->
<!-- Number: 1 - 64800 --> <!-- Number: 1 - 64800 -->
<!-- Mandatory --> <!-- Mandatory -->
<P32>3</P32> <P32>{$register_expires_1}</P32>
<!-- Subscribe Expiration. Default is 60. Max about 45 days --> <!-- Subscribe Expiration. Default is 60. Max about 45 days -->
<!-- Number: 1 - 64800 --> <!-- Number: 1 - 64800 -->
@@ -869,8 +869,8 @@
<!-- NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0 --> <!-- NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0 -->
<!-- Number: 0, 1, 2, 3, 4, 5 --> <!-- Number: 0, 1, 2, 3, 4, 5 -->
<!-- Mandatory --> <!-- Mandatory -->
{if isset($nat_traversal_2) } {if isset($grandstream_nat_traversal_2) }
<P414>{$nat_traversal_2}</P414> <P414>{$grandstream_nat_traversal_2}</P414>
{else} {else}
<P414>0</P414> <P414>0</P414>
{/if} {/if}
@@ -900,7 +900,7 @@
<!-- Register Expiration (in minutes). Default is 60. Max is 45 days --> <!-- Register Expiration (in minutes). Default is 60. Max is 45 days -->
<!-- Number: 1 - 64800 --> <!-- Number: 1 - 64800 -->
<!-- Mandatory --> <!-- Mandatory -->
<P412>3</P412> <P412>{$register_expires_2}</P412>
<!-- Subscribe Expiration. Default is 60. Max about 45 days --> <!-- Subscribe Expiration. Default is 60. Max about 45 days -->
<!-- Number: 1 - 64800 --> <!-- Number: 1 - 64800 -->
@@ -1623,8 +1623,8 @@
<!-- NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0 --> <!-- NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0 -->
<!-- Number: 0, 1, 2, 3, 4, 5 --> <!-- Number: 0, 1, 2, 3, 4, 5 -->
<!-- Mandatory --> <!-- Mandatory -->
{if isset($nat_traversal_3) } {if isset($grandstream_nat_traversal_3) }
<P514>{$nat_traversal_3}</P514> <P514>{$grandstream_nat_traversal_3}</P514>
{else} {else}
<P514>0</P514> <P514>0</P514>
{/if} {/if}
@@ -1654,7 +1654,7 @@
<!-- Register Expiration (in minutes). Default is 60. Max is 45 days --> <!-- Register Expiration (in minutes). Default is 60. Max is 45 days -->
<!-- Number: 1 - 64800 --> <!-- Number: 1 - 64800 -->
<!-- Mandatory --> <!-- Mandatory -->
<P512>3</P512> <P512>{$register_expires_3}</P512>
<!-- Subscribe Expiration. Default is 60. Max about 45 days --> <!-- Subscribe Expiration. Default is 60. Max about 45 days -->
<!-- Number: 1 - 64800 --> <!-- Number: 1 - 64800 -->
@@ -2376,8 +2376,8 @@
<!-- NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0 --> <!-- NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0 -->
<!-- Number: 0, 1, 2, 3, 4, 5 --> <!-- Number: 0, 1, 2, 3, 4, 5 -->
<!-- Mandatory --> <!-- Mandatory -->
{if isset($nat_traversal_4) } {if isset($grandstream_nat_traversal_4) }
<P614>{$nat_traversal_4}</P614> <P614>{$grandstream_nat_traversal_4}</P614>
{else} {else}
<P614>0</P614> <P614>0</P614>
{/if} {/if}
@@ -2407,7 +2407,7 @@
<!-- Register Expiration (in minutes). Default is 60. Max is 45 days --> <!-- Register Expiration (in minutes). Default is 60. Max is 45 days -->
<!-- Number: 1 - 64800 --> <!-- Number: 1 - 64800 -->
<!-- Mandatory --> <!-- Mandatory -->
<P612>3</P612> <P612>{$register_expires_4}</P612>
<!-- Subscribe Expiration. Default is 60. Max about 45 days --> <!-- Subscribe Expiration. Default is 60. Max about 45 days -->
<!-- Number: 1 - 64800 --> <!-- Number: 1 - 64800 -->
@@ -3131,8 +3131,8 @@
<!-- NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0 --> <!-- NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0 -->
<!-- Number: 0, 1, 2, 3, 4, 5 --> <!-- Number: 0, 1, 2, 3, 4, 5 -->
<!-- Mandatory --> <!-- Mandatory -->
{if isset($nat_traversal_5) } {if isset($grandstream_nat_traversal_5) }
<P1714>{$nat_traversal_5}</P1714> <P1714>{$grandstream_nat_traversal_5}</P1714>
{else} {else}
<P1714>0</P1714> <P1714>0</P1714>
{/if} {/if}
@@ -3162,7 +3162,7 @@
<!-- Register Expiration (in minutes. default 1 hour, max 45 days) --> <!-- Register Expiration (in minutes. default 1 hour, max 45 days) -->
<!-- Number: 1-64800 --> <!-- Number: 1-64800 -->
<!-- Mandatory --> <!-- Mandatory -->
<P1712>3</P1712> <P1712>{$register_expires_5}</P1712>
<!-- Subscribe Expiration. Default is 60. Max about 45 days --> <!-- Subscribe Expiration. Default is 60. Max about 45 days -->
<!-- Number: 1 - 64800 --> <!-- Number: 1 - 64800 -->
@@ -3885,8 +3885,8 @@
<!-- NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0 --> <!-- NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0 -->
<!-- Number: 0, 1, 2, 3, 4, 5 --> <!-- Number: 0, 1, 2, 3, 4, 5 -->
<!-- Mandatory --> <!-- Mandatory -->
{if isset($nat_traversal_6) } {if isset($grandstream_nat_traversal_6) }
<P1814>{$nat_traversal_6}</P1814> <P1814>{$grandstream_nat_traversal_6}</P1814>
{else} {else}
<P1814>0</P1814> <P1814>0</P1814>
{/if} {/if}
@@ -3917,7 +3917,7 @@
<!-- Register Expiration (in minutes). Default is 60. Max is 45 days --> <!-- Register Expiration (in minutes). Default is 60. Max is 45 days -->
<!-- Number: 1 - 64800 --> <!-- Number: 1 - 64800 -->
<!-- Mandatory --> <!-- Mandatory -->
<P1812>3</P1812> <P1812>{$register_expires_6}</P1812>
<!-- Subscribe Expiration. Default is 60. Max about 45 days --> <!-- Subscribe Expiration. Default is 60. Max about 45 days -->
<!-- Number: 1 - 64800 --> <!-- Number: 1 - 64800 -->
resources/templates/provision/grandstream/gxp2170/{$mac}.xml
+19 -16
View File
@@ -129,7 +129,7 @@
<!-- # Register Expiration (in minutes). Default is 60. Max about 45 days --> <!-- # Register Expiration (in minutes). Default is 60. Max about 45 days -->
<!-- # Number: 1 - 64800 --> <!-- # Number: 1 - 64800 -->
<!-- # Mandatory --> <!-- # Mandatory -->
<P32>60</P32> <P32>{$register_expires_1}</P32>
<!-- # Subscribe Expiration. Default is 60. Max about 45 days --> <!-- # Subscribe Expiration. Default is 60. Max about 45 days -->
<!-- # Number: 1 - 64800 --> <!-- # Number: 1 - 64800 -->
@@ -670,33 +670,33 @@
<!-- # Matching Incoming Caller ID. Matching Rule 1 --> <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
<!-- # String --> <!-- # String -->
<P1488></P1488> <P1488>ring1</P1488>
<!-- # Matching Rule 1 Distinctive Ringtone --> <!-- # Matching Rule 1 Distinctive Ringtone -->
<!-- # 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent. Default is 0. --> <!-- # 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent. Default is 0. -->
<!-- # Number: 0, 1, 2, 3, 4 --> <!-- # Number: 0, 1, 2, 3, 4 -->
<!-- # Mandatory --> <!-- # Mandatory -->
<P1489>0</P1489> <P1489>1</P1489>
<!-- # Matching Incoming Caller ID. Matching Rule 2 --> <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
<!-- # String --> <!-- # String -->
<P1490></P1490> <P1490>ring2</P1490>
<!-- # Matching Rule 2 Distinctive Ringtone --> <!-- # Matching Rule 2 Distinctive Ringtone -->
<!-- # 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent. Default is 0. --> <!-- # 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent. Default is 0. -->
<!-- # Number: 0, 1, 2, 3, 4 --> <!-- # Number: 0, 1, 2, 3, 4 -->
<!-- # Mandatory --> <!-- # Mandatory -->
<P1491>0</P1491> <P1491>2</P1491>
<!-- # Matching Incoming Caller ID. Matching Rule 3 --> <!-- # Matching Incoming Caller ID. Matching Rule 3 -->
<!-- # String --> <!-- # String -->
<P1492></P1492> <P1492>ring</P1492>
<!-- # Matching Rule 3 Distinctive Ringtone --> <!-- # Matching Rule 3 Distinctive Ringtone -->
<!-- # 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent. Default is 0. --> <!-- # 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent. Default is 0. -->
<!-- # Number: 0, 1, 2, 3, 4 --> <!-- # Number: 0, 1, 2, 3, 4 -->
<!-- # Mandatory --> <!-- # Mandatory -->
<P1493>0</P1493> <P1493>3</P1493>
<!-- # Ring Timeout (in seconds). Default is 60 --> <!-- # Ring Timeout (in seconds). Default is 60 -->
<!-- # Number: 30 - 3600 --> <!-- # Number: 30 - 3600 -->
@@ -806,7 +806,8 @@
<!-- #Enable Call Features. 0 - No, 1 - Yes. Default is 1 --> <!-- #Enable Call Features. 0 - No, 1 - Yes. Default is 1 -->
<!-- #Number: 0, 1 --> <!-- #Number: 0, 1 -->
<!-- #Mandatory --> <!-- #Mandatory -->
<P191>1</P191> <!-- # This must be 0 for FusionPBX features to work!!! -->
<P191>0</P191>
<!-- #Do Not Disturb (DND) - On --> <!-- #Do Not Disturb (DND) - On -->
<!-- # String --> <!-- # String -->
@@ -966,7 +967,7 @@
<!-- # Register Expiration (in minutes). Default is 60. Max is 45 days --> <!-- # Register Expiration (in minutes). Default is 60. Max is 45 days -->
<!-- # Number: 1 - 64800 --> <!-- # Number: 1 - 64800 -->
<!-- # Mandatory --> <!-- # Mandatory -->
<P412>60</P412> <P412>{$register_expires_2}</P412>
<!-- # Subscribe Expiration. Default is 60. Max about 45 days --> <!-- # Subscribe Expiration. Default is 60. Max about 45 days -->
<!-- # Number: 1 - 64800 --> <!-- # Number: 1 - 64800 -->
@@ -1803,7 +1804,7 @@
<!-- # Register Expiration (in minutes). Default is 60. Max is 45 days --> <!-- # Register Expiration (in minutes). Default is 60. Max is 45 days -->
<!-- # Number: 1 - 64800 --> <!-- # Number: 1 - 64800 -->
<!-- # Mandatory --> <!-- # Mandatory -->
<P512>60</P512> <P512>{$register_expires_3}</P512>
<!-- # Subscribe Expiration. Default is 60. Max about 45 days --> <!-- # Subscribe Expiration. Default is 60. Max about 45 days -->
<!-- # Number: 1 - 64800 --> <!-- # Number: 1 - 64800 -->
@@ -2639,7 +2640,7 @@
<!-- # Register Expiration (in minutes). Default is 60. Max is 45 days --> <!-- # Register Expiration (in minutes). Default is 60. Max is 45 days -->
<!-- # Number: 1 - 64800 --> <!-- # Number: 1 - 64800 -->
<!-- # Mandatory --> <!-- # Mandatory -->
<P612>60</P612> <P612>{$register_expires_4}</P612>
<!-- # Subscribe Expiration. Default is 60. Max about 45 days --> <!-- # Subscribe Expiration. Default is 60. Max about 45 days -->
<!-- # Number: 1 - 64800 --> <!-- # Number: 1 - 64800 -->
@@ -3477,7 +3478,7 @@
<!-- # Register Expiration (in minutes. default 1 hour, max 45 days) --> <!-- # Register Expiration (in minutes. default 1 hour, max 45 days) -->
<!-- # Number: 1-64800 --> <!-- # Number: 1-64800 -->
<!-- # Mandatory --> <!-- # Mandatory -->
<P1712>60</P1712> <P1712>{$register_expires_5}</P1712>
<!-- # Subscribe Expiration. Default is 60. Max about 45 days --> <!-- # Subscribe Expiration. Default is 60. Max about 45 days -->
<!-- # Number: 1 - 64800 --> <!-- # Number: 1 - 64800 -->
@@ -4315,7 +4316,7 @@
<!-- # Register Expiration (in minutes). Default is 60. Max is 45 days --> <!-- # Register Expiration (in minutes). Default is 60. Max is 45 days -->
<!-- # Number: 1 - 64800 --> <!-- # Number: 1 - 64800 -->
<!-- # Mandatory --> <!-- # Mandatory -->
<P1812>60</P1812> <P1812>{$register_expires_6}</P1812>
<!-- # Subscribe Expiration. Default is 60. Max about 45 days --> <!-- # Subscribe Expiration. Default is 60. Max about 45 days -->
<!-- # Number: 1 - 64800 --> <!-- # Number: 1 - 64800 -->
@@ -5270,7 +5271,7 @@
{if isset($grandstream_pc_port_vlan) } {if isset($grandstream_pc_port_vlan) }
<P229>{$grandstream_pc_port_vlan}</P229> <P229>{$grandstream_pc_port_vlan}</P229>
{else} {else}
<P229>1</P229> <P229>0</P229>
{/if} {/if}
<!-- # PC Port Priority Value. Default is 0 --> <!-- # PC Port Priority Value. Default is 0 -->
@@ -7206,12 +7207,14 @@
<!-- # Speaker Ring Volume --> <!-- # Speaker Ring Volume -->
<!-- # Number: 0-7. Default is 5. --> <!-- # Number: 0-7. Default is 5. -->
<!-- # Mandatory --> <!-- # Mandatory -->
<P8352>5</P8352> <!-- ##### We should NOT force the user's volume!!! ### -->
<!-- <P8352>5</P8352> -->
<!-- # Notification Tone Volume --> <!-- # Notification Tone Volume -->
<!-- # Number: 0-7. Default is 5. --> <!-- # Number: 0-7. Default is 5. -->
<!-- # Mandatory --> <!-- # Mandatory -->
<P8399>5</P8399> <!-- ##### We should NOT force the user's volume!!! ### -->
<!-- <P8399>5</P8399> -->
<!-- # Lock Volumne. 0 - No, 1 - Yes. Default is 0 --> <!-- # Lock Volumne. 0 - No, 1 - Yes. Default is 0 -->
<!-- # Number: 0, 1 --> <!-- # Number: 0, 1 -->