Changeset 11712

Show
Ignore:
Timestamp:
03/06/11 11:30:20 (2 years ago)
Author:
p_lindheimer
Message:

fixes #4804 and closes #4908 changed to allow only specific transports or all transports specifying each as primary, 6 settings total, I don't think we want to add another 6 settings for each pair in both orders.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.9/core/functions.inc.php

    r11676 r11712  
    67656765    if (version_compare($amp_conf['ASTVERSION'],'1.8','ge')) { 
    67666766      unset($select); 
    6767       $select[] = array('value' => 'udp', 'text' => _('UDP')); 
    6768       $select[] = array('value' => 'tcp', 'text' => _('TCP or TLS')); 
    6769       $tt = _("This sets the default transport type for outgoing, and will accept both tcp and udp. The default transport type is only used for outbound messages until a Registration takes place.  During the peer Registration the transport type may change to another supported type if the peer requests so. In most common cases, this does not have to be changed as most devices register in conjunction with the host=dyanmic setting."); 
     6767      $select[] = array('value' => 'udp,tcp,tls', 'text' => _('All - UDP Primary')); 
     6768      $select[] = array('value' => 'tcp,udp,tls', 'text' => _('All - TCP Primary')); 
     6769      $select[] = array('value' => 'tls,udp,tcp', 'text' => _('All - TLS Primary')); 
     6770      $select[] = array('value' => 'udp', 'text' => _('UDP Only')); 
     6771      $select[] = array('value' => 'tcp', 'text' => _('TCP Only')); 
     6772      $select[] = array('value' => 'tls', 'text' => _('TLS Only')); 
     6773      $tt = _("This sets the allowed transport settings for this device and the default (Primary) transport for outgoing. The default transport is only used for outbound messages until a registration takes place.  During the peer registration the transport type may change to another supported type if the peer requests so. In most common cases, this does not have to be changed as most devices register in conjunction with the host=dyanmic setting. If you are using TCP and/or TLS you need to make sure the general SIP Settings are configured for the system to operate in those modes and for TLS, proper certificates have been generated and configured."); 
    67706774      $tmparr['transport'] = array('value' => 'udp', 'tt' => $tt, 'select' => $select, 'level' => 1); 
    67716775