Changeset 5116

Show
Ignore:
Timestamp:
10/10/07 01:26:02 (6 years ago)
Author:
p_lindheimer
Message:

Merged revisions 5114 via svnmerge from
http://svn.freepbx.org/modules/branches/2.4

........

r5114 | p_lindheimer | 2007-10-09 22:13:34 -0700 (Tue, 09 Oct 2007) | 1 line


add PREDIAL_HOOK_RET to predial-hook to allow the hook to have the trunk bypassed

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.3

    • Property svnmerge-integrated changed from /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097,5103,5109 to /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097,5103,5109,5114

  • modules/branches/2.3/core/etc/extensions.conf

    r5111 r5116  
    638638; this macro intentially left blank so it may be safely overwritten for any custom 
    639639; requirements that an installatin may have. 
     640; 
     641; MACRO RETURN CODE: ${PREDIAL_HOOK_RET} 
     642;                    if set to "BYPASS" then this trunk will be skipped 
     643; 
    640644 
    641645 
    …… 
    687691; 
    688692exten => s,n,Macro(dialout-trunk-predial-hook) 
     693exten => s,n,GotoIf($["${PREDIAL_HOOK_RET}" = "BYPASS"]?bypass,1) 
    689694 
    690695exten => s,n(gocall),GotoIf($["${custom}" = "AMP"]?customtrunk) 
    …… 
    717722 
    718723exten => disabletrunk,1,Noop(TRUNK: ${OUT_${DIAL_TRUNK}} DISABLED - falling through to next trunk) 
     724exten => bypass,1,Noop(TRUNK: ${OUT_${DIAL_TRUNK}} BYPASSING because dialout-trunk-predial-hook) 
    719725 
    720726exten => h,1,Macro(hangupcall) 

  • modules/branches/2.3/core/module.xml

    r5034 r5116  
    88  <canuninstall>no</canuninstall> 
    99  <changelog> 
    10     *2.3.0.3* #2308 FROM_DID to use ${EXTEN}, #2381 add iax_genera_custom.conf, #2375 localization fixes 
     10    *2.3.0.3* #2308 FROM_DID to use ${EXTEN}, #2381 add iax_general_custom.conf, #2375 localization fixes 
    1111    *2.3.0.2* #2330 allow '_' in route name changes, fix missing global variable. 
    1212    *2.3.0.1* fix support link