Fix server 2 server address and sip transport
This commit is contained in:
parent
155875b6bf
commit
3ffd58ce26
|
|
@ -2131,8 +2131,12 @@
|
||||||
<item name="call.transfer.attended.mode">Dynamic</item>
|
<item name="call.transfer.attended.mode">Dynamic</item>
|
||||||
|
|
||||||
<!-- # Transfer Mode via VPK/MPK. -->
|
<!-- # Transfer Mode via VPK/MPK. -->
|
||||||
<!-- BlindTransfer, AttendedTransfer, NewCall -->
|
<!-- BlindTransfer, AttendedTransfer, NewCall -->
|
||||||
|
{if isset($grandstream_transfer_mode_via_vpk)}
|
||||||
|
<item name="call.transfer.modeViaVpk">{$grandstream_transfer_mode_via_vpk}</item>
|
||||||
|
{else}
|
||||||
<item name="call.transfer.modeViaVpk">BlindTransfer</item>
|
<item name="call.transfer.modeViaVpk">BlindTransfer</item>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<!-- # Show On Hold Duration. Yes or No -->
|
<!-- # Show On Hold Duration. Yes or No -->
|
||||||
<item name="call.hold.showHoldDuration.enable">Yes</item>
|
<item name="call.hold.showHoldDuration.enable">Yes</item>
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,11 @@
|
||||||
<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address}:{$row.sip_port}</item>
|
<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address}:{$row.sip_port}</item>
|
||||||
{/if}
|
{/if}
|
||||||
<!-- Secondary SIP Server -->
|
<!-- Secondary SIP Server -->
|
||||||
|
{if isset($row.server_address_secondary)}
|
||||||
<item name="account.{$row.line_number}.sip.server.2.address">{$row.server_address_secondary}:{$row.sip_port}</item>
|
<item name="account.{$row.line_number}.sip.server.2.address">{$row.server_address_secondary}:{$row.sip_port}</item>
|
||||||
|
{else}
|
||||||
|
<item name="account.{$row.line_number}.sip.server.2.address"/>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<!-- Outbound Proxy -->
|
<!-- Outbound Proxy -->
|
||||||
{if $row.sip_transport != 'dns srv' && isset($row.outbound_proxy_primary)}
|
{if $row.sip_transport != 'dns srv' && isset($row.outbound_proxy_primary)}
|
||||||
|
|
@ -176,10 +180,11 @@
|
||||||
|
|
||||||
<!-- SIP Transport -->
|
<!-- SIP Transport -->
|
||||||
<!-- UDP, TCP, Tls Or Tcp -->
|
<!-- UDP, TCP, Tls Or Tcp -->
|
||||||
{if $row.sip_transport == ''}<item name="account.{$row.line_number}.sip.transport">TCP</item>{/if}
|
<!-- Variable Value: {$row.sip_transport} -->
|
||||||
{if $row.sip_transport == 'udp'}<item name="account.{$row.line_number}.sip.transport">UDP</item>{/if}
|
{if $row.sip_transport == ''}<item name="account.{$row.line_number}.sip.transport">1</item>{/if}
|
||||||
{if $row.sip_transport == 'tcp'}<item name="account.{$row.line_number}.sip.transport">TCP</item>{/if}
|
{if $row.sip_transport == 'udp'}<item name="account.{$row.line_number}.sip.transport">0</item>{/if}
|
||||||
{if $row.sip_transport == 'tls'}<item name="account.{$row.line_number}.sip.transport">Tls</item>{/if}
|
{if $row.sip_transport == 'tcp'}<item name="account.{$row.line_number}.sip.transport">1</item>{/if}
|
||||||
|
{if $row.sip_transport == 'tls'}<item name="account.{$row.line_number}.sip.transport">2</item>{/if}
|
||||||
|
|
||||||
<!-- SIP Listening Mode -->
|
<!-- SIP Listening Mode -->
|
||||||
<!-- Transport_Only, Dual, Dual_BLF_Enforced, Dual_Secured -->
|
<!-- Transport_Only, Dual, Dual_BLF_Enforced, Dual_Secured -->
|
||||||
|
|
@ -909,6 +914,7 @@
|
||||||
<!-- # Mandatory -->
|
<!-- # Mandatory -->
|
||||||
<item name="network.port.eth.1.vlan.enable">{if $grandstream_lan_port_vlan == '0'}No{else}Yes{/if}</item>
|
<item name="network.port.eth.1.vlan.enable">{if $grandstream_lan_port_vlan == '0'}No{else}Yes{/if}</item>
|
||||||
|
|
||||||
|
|
||||||
<!-- # Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP). Default is 0 -->
|
<!-- # Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP). Default is 0 -->
|
||||||
<!-- Layer 2 QoS 802.1Q/VLAN Tag (Ethernet) -->
|
<!-- Layer 2 QoS 802.1Q/VLAN Tag (Ethernet) -->
|
||||||
<!-- Number: 0 - 4095 -->
|
<!-- Number: 0 - 4095 -->
|
||||||
|
|
@ -2132,7 +2138,11 @@
|
||||||
|
|
||||||
<!-- # Transfer Mode via VPK/MPK. -->
|
<!-- # Transfer Mode via VPK/MPK. -->
|
||||||
<!-- BlindTransfer, AttendedTransfer, NewCall -->
|
<!-- BlindTransfer, AttendedTransfer, NewCall -->
|
||||||
|
{if isset($grandstream_transfer_mode_via_vpk)}
|
||||||
<item name="call.transfer.modeViaVpk">{$grandstream_transfer_mode_via_vpk}</item>
|
<item name="call.transfer.modeViaVpk">{$grandstream_transfer_mode_via_vpk}</item>
|
||||||
|
{else}
|
||||||
|
<item name="call.transfer.modeViaVpk">BlindTransfer</item>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<!-- # Show On Hold Duration. Yes or No -->
|
<!-- # Show On Hold Duration. Yes or No -->
|
||||||
<item name="call.hold.showHoldDuration.enable">Yes</item>
|
<item name="call.hold.showHoldDuration.enable">Yes</item>
|
||||||
|
|
|
||||||
|
|
@ -909,7 +909,6 @@
|
||||||
<!-- # Mandatory -->
|
<!-- # Mandatory -->
|
||||||
<item name="network.port.eth.1.vlan.enable">{if $grandstream_lan_port_vlan == '0'}No{else}Yes{/if}</item>
|
<item name="network.port.eth.1.vlan.enable">{if $grandstream_lan_port_vlan == '0'}No{else}Yes{/if}</item>
|
||||||
|
|
||||||
|
|
||||||
<!-- # Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP). Default is 0 -->
|
<!-- # Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP). Default is 0 -->
|
||||||
<!-- Layer 2 QoS 802.1Q/VLAN Tag (Ethernet) -->
|
<!-- Layer 2 QoS 802.1Q/VLAN Tag (Ethernet) -->
|
||||||
<!-- Number: 0 - 4095 -->
|
<!-- Number: 0 - 4095 -->
|
||||||
|
|
@ -2132,8 +2131,12 @@
|
||||||
<item name="call.transfer.attended.mode">Dynamic</item>
|
<item name="call.transfer.attended.mode">Dynamic</item>
|
||||||
|
|
||||||
<!-- # Transfer Mode via VPK/MPK. -->
|
<!-- # Transfer Mode via VPK/MPK. -->
|
||||||
<!-- BlindTransfer, AttendedTransfer, NewCall -->
|
<!-- BlindTransfer, AttendedTransfer, NewCall -->
|
||||||
|
{if isset($grandstream_transfer_mode_via_vpk)}
|
||||||
|
<item name="call.transfer.modeViaVpk">{$grandstream_transfer_mode_via_vpk}</item>
|
||||||
|
{else}
|
||||||
<item name="call.transfer.modeViaVpk">BlindTransfer</item>
|
<item name="call.transfer.modeViaVpk">BlindTransfer</item>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<!-- # Show On Hold Duration. Yes or No -->
|
<!-- # Show On Hold Duration. Yes or No -->
|
||||||
<item name="call.hold.showHoldDuration.enable">Yes</item>
|
<item name="call.hold.showHoldDuration.enable">Yes</item>
|
||||||
|
|
@ -3318,4 +3321,4 @@
|
||||||
{/foreach}
|
{/foreach}
|
||||||
|
|
||||||
</config>
|
</config>
|
||||||
</gs_provision>
|
</gs_provision>
|
||||||
|
|
|
||||||
|
|
@ -909,7 +909,6 @@
|
||||||
<!-- # Mandatory -->
|
<!-- # Mandatory -->
|
||||||
<item name="network.port.eth.1.vlan.enable">{if $grandstream_lan_port_vlan == '0'}No{else}Yes{/if}</item>
|
<item name="network.port.eth.1.vlan.enable">{if $grandstream_lan_port_vlan == '0'}No{else}Yes{/if}</item>
|
||||||
|
|
||||||
|
|
||||||
<!-- # Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP). Default is 0 -->
|
<!-- # Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP). Default is 0 -->
|
||||||
<!-- Layer 2 QoS 802.1Q/VLAN Tag (Ethernet) -->
|
<!-- Layer 2 QoS 802.1Q/VLAN Tag (Ethernet) -->
|
||||||
<!-- Number: 0 - 4095 -->
|
<!-- Number: 0 - 4095 -->
|
||||||
|
|
@ -2132,8 +2131,12 @@
|
||||||
<item name="call.transfer.attended.mode">Dynamic</item>
|
<item name="call.transfer.attended.mode">Dynamic</item>
|
||||||
|
|
||||||
<!-- # Transfer Mode via VPK/MPK. -->
|
<!-- # Transfer Mode via VPK/MPK. -->
|
||||||
<!-- BlindTransfer, AttendedTransfer, NewCall -->
|
<!-- BlindTransfer, AttendedTransfer, NewCall -->
|
||||||
|
{if isset($grandstream_transfer_mode_via_vpk)}
|
||||||
|
<item name="call.transfer.modeViaVpk">{$grandstream_transfer_mode_via_vpk}</item>
|
||||||
|
{else}
|
||||||
<item name="call.transfer.modeViaVpk">BlindTransfer</item>
|
<item name="call.transfer.modeViaVpk">BlindTransfer</item>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<!-- # Show On Hold Duration. Yes or No -->
|
<!-- # Show On Hold Duration. Yes or No -->
|
||||||
<item name="call.hold.showHoldDuration.enable">Yes</item>
|
<item name="call.hold.showHoldDuration.enable">Yes</item>
|
||||||
|
|
@ -3318,4 +3321,4 @@
|
||||||
{/foreach}
|
{/foreach}
|
||||||
|
|
||||||
</config>
|
</config>
|
||||||
</gs_provision>
|
</gs_provision>
|
||||||
|
|
|
||||||
|
|
@ -909,7 +909,6 @@
|
||||||
<!-- # Mandatory -->
|
<!-- # Mandatory -->
|
||||||
<item name="network.port.eth.1.vlan.enable">{if $grandstream_lan_port_vlan == '0'}No{else}Yes{/if}</item>
|
<item name="network.port.eth.1.vlan.enable">{if $grandstream_lan_port_vlan == '0'}No{else}Yes{/if}</item>
|
||||||
|
|
||||||
|
|
||||||
<!-- # Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP). Default is 0 -->
|
<!-- # Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP). Default is 0 -->
|
||||||
<!-- Layer 2 QoS 802.1Q/VLAN Tag (Ethernet) -->
|
<!-- Layer 2 QoS 802.1Q/VLAN Tag (Ethernet) -->
|
||||||
<!-- Number: 0 - 4095 -->
|
<!-- Number: 0 - 4095 -->
|
||||||
|
|
@ -2132,8 +2131,12 @@
|
||||||
<item name="call.transfer.attended.mode">Dynamic</item>
|
<item name="call.transfer.attended.mode">Dynamic</item>
|
||||||
|
|
||||||
<!-- # Transfer Mode via VPK/MPK. -->
|
<!-- # Transfer Mode via VPK/MPK. -->
|
||||||
<!-- BlindTransfer, AttendedTransfer, NewCall -->
|
<!-- BlindTransfer, AttendedTransfer, NewCall -->
|
||||||
|
{if isset($grandstream_transfer_mode_via_vpk)}
|
||||||
|
<item name="call.transfer.modeViaVpk">{$grandstream_transfer_mode_via_vpk}</item>
|
||||||
|
{else}
|
||||||
<item name="call.transfer.modeViaVpk">BlindTransfer</item>
|
<item name="call.transfer.modeViaVpk">BlindTransfer</item>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<!-- # Show On Hold Duration. Yes or No -->
|
<!-- # Show On Hold Duration. Yes or No -->
|
||||||
<item name="call.hold.showHoldDuration.enable">Yes</item>
|
<item name="call.hold.showHoldDuration.enable">Yes</item>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue