Summary: | ASTERISK-15021: [patch] Auto-fallthrough when attempting to enter DTMF using Background() in a Macro() | ||
Reporter: | ornix (ornix) | Labels: | |
Date Opened: | 2009-10-22 03:59:00 | Date Closed: | 2009-12-17 11:24:51.000-0600 |
Priority: | Minor | Regression? | Yes |
Status: | Closed/Complete | Components: | General |
Versions: | Frequency of Occurrence | ||
Related Issues: | |||
Environment: | Attachments: | ( 0) 20091216__issue16113.diff.txt | |
Description: | Hello, All. Asterisk calls me using a call-file, then i make call with the following macro: [macro-internalcall-with-redirect-callback] exten => s,1,Dial(SIP/${ARG1},20,jgtedH) exten => s,n,Goto(s-${DIALSTATUS},1) exten => s-BUSY,1,Background(busy-cycl0) exten => s-BUSY,2,Goto(${CONTEXT},s,1) In ${MACRO_CONTEXT} i have extensions: exten => *,1,ResetCDR(w) exten => *,n,Goto(${CONTEXT},s,5) I make a call to _XXX, recieve "BUSY". While busy-cycl0 is playing, i hit the "*"-key. 1.6.1.7rc2 - Strange behavior: [Oct 16 18:03:19] -- Executing [s@macro-internalcall-with-redirect-callback:3] Goto("H323/sibirtelecom-1", "s-BUSY,1") in new stack [Oct 16 18:03:19] -- Goto (macro-internalcall-with-redirect-callback,s-BUSY,1) [Oct 16 18:03:19] -- Executing [s-BUSY@macro-internalcall-with-redirect-callback:1] BackGround("H323/sibirtelecom-1", "busy-cycl0") in new stack [Oct 16 18:03:19] -- <H323/sibirtelecom-1> Playing 'busy-cycl0.alaw' (language 'en') [Oct 16 18:03:20] -- Auto fallthrough, channel 'H323/sibirtelecom-1' status is 'BUSY' [Oct 16 18:03:24] DEBUG[9435]: pbx_spool.c:405 scan_service: Delaying retry since we're currently running '/var/spool/asterisk/outgoing/32631.call' [Oct 16 18:03:27] NOTICE[9475]: pbx_spool.c:348 attempt_thread: Call completed to Local/2487305@qqq 1.6.1.4 - Normal behavior: [Oct 16 18:06:43] -- Executing [s@macro-internalcall-with-redirect-callback:3] Goto("H323/sibirtelecom-1", "s-BUSY,1") in new stack [Oct 16 18:06:43] -- Goto (macro-internalcall-with-redirect-callback,s-BUSY,1) [Oct 16 18:06:43] -- Executing [s-BUSY@macro-internalcall-with-redirect-callback:1] BackGround("H323/sibirtelecom-1", "busy-cycl0") in new stack [Oct 16 18:06:43] -- <H323/sibirtelecom-1> Playing 'busy-cycl0.alaw' (language 'en') [Oct 16 18:06:44] == CDR updated on H323/sibirtelecom-1 [Oct 16 18:06:44] -- Executing [*@callback:1] ResetCDR("H323/sibirtelecom-1", "w") in new stack [Oct 16 18:06:44] -- Executing [*@callback:2] Goto("H323/sibirtelecom-1", "callback,s,5") in new stack [Oct 16 18:06:44] -- Goto (callback,s,5) [Oct 16 18:06:44] -- Executing [s@callback:5] WaitExten("H323/sibirtelecom-1", "1") in new stack This error occurs both with chan_h323 and with chan_ooh323. P.S. I don't know, what category should i select in this case, please move the topic to the correct one. | ||
Comments: | By: Leif Madsen (lmadsen) 2009-10-26 09:05:50 Are you able to reproduce this on any other channel types? (i.e. chan_sip). I'm curious if this is localized to something in chan_h323*, or if it is something to do with a dialplan/CDR change in the code. Thanks! By: ornix (ornix) 2009-10-28 03:00:36 Today i've reproduced this error with chan_sip on 1.6.1.8. [Oct 28 13:49:18] -- Executing [s@macro-internalcall-with-redirect-callback:3] Goto("SIP/ap1100-0a0796b0", "s-BUSY,1") in new stack [Oct 28 13:49:18] -- Goto (macro-internalcall-with-redirect-callback,s-BUSY,1) [Oct 28 13:49:18] -- Executing [s-BUSY@macro-internalcall-with-redirect-callback:1] BackGround("SIP/ap1100-0a0796b0", "busy-cycl0") in new stack [Oct 28 13:49:18] -- <SIP/ap1100-0a0796b0> Playing 'busy-cycl0.alaw' (language 'ru') <--! Here i've hit an asterisk-key (*): --> [Oct 28 13:49:19] -- Auto fallthrough, channel 'SIP/ap1100-0a0796b0' status is 'BUSY' [Oct 28 13:49:21] DEBUG[1278]: pbx_spool.c:405 scan_service: Delaying retry since we're currently running '/var/spool/asterisk/outgoing/29697.call' [Oct 28 13:49:27] NOTICE[1316]: pbx_spool.c:348 attempt_thread: Call completed to SIP/ap1100/992487305 By: Leif Madsen (lmadsen) 2009-10-28 08:54:09 Could you provide the dialplan you used to reproduce this? Thanks! By: ornix (ornix) 2009-10-28 10:05:15 I'll show you a piece of dialplan with H.323 because it is more readable than the SIP variant. Asterisk calls me with call-file: Channel: Local/2487305@qqq Callerid: 2487305 Context: callback Extension: s MaxRetries: 1 Retrytime: 10 WaitTime: 60 Priority: 1 fragment of extensions.conf: [qqq] exten => _XXXXXXX,1,Macro(cb-ooh323,${EXTEN}) [macro-cb-ooh323] exten => s,1,NoCDR() exten => s,n,Set(CALLERID(num)=3833540661) exten => s,n,Dial(H323/sibirtelecom/${ARG1},,Tg) exten => s,n,Goto(s-${HANGUPCAUSE},1) [macro-internalcall-with-redirect-callback] exten => s,1,Set(CALLERID(all)=${CLID}) exten => s,n,Dial(SIP/${ARG1},20,jgtedH) exten => s,n,Goto(s-${DIALSTATUS},1) exten => s-NOANSWER,1,Background(redirect_with_cancel) exten => s-NOANSWER,n,Ringing() exten => s-NOANSWER,n,Set(CALLERID(num)=3833540662) exten => s-NOANSWER,n,Set(CALLERID(name)=${CLID}) exten => s-NOANSWER,n,Set(CDR(userfield)=${CALLERID(num)}) exten => s-NOANSWER,n,Dial(SIP/${ARG1}&H323/sibirtelecom/${ARG2},,jgHde)) exten => s-NOANSWER,n,Goto(${MACRO_CONTEXT},s,5) exten => s-BUSY,1,Background(busy-cycl0) exten => s-BUSY,2,Goto(${CONTEXT},s,1) exten => s-CHANUNAVAIL,1,Background(notavail) exten => s-CHANUNAVAIL,2,Goto(${CONTEXT},s-NOANSWER,1) exten => s-ANSWER,1,Goto(${MACRO_CONTEXT},s,5) exten => s-CANCEL,1,Goto(${CONTEXT},s-ANSWER,1) exten => 5,1,Goto(${CONTEXT},s-NOANSWER,1) [callback] exten => s,1,Answer() exten => s,n,Set(CLID=${CALLERID(num)}) exten => s,n,Set(CALLERID(name)=${CLID}) exten => s,n,Set(TIMEOUT(digit)=6) exten => s,n,Waitexten(1) exten => s,n,Background(enter_int_number) exten => s,n,Waitexten(30) exten => s,n,Background(ostalos-10) exten => s,n,Background(otschet) exten => s,n,Hangup() ..................... exten => fax,1,Goto(fax,s,1) exten => *,1,ResetCDR(w) exten => *,n,Goto(callback,s,5) exten => t,1,Hangup() exten => i,1,Background(num-invalid) exten => i,2,Goto(callback,s,7) If it isn't clear, i can explain the logic. By: ornix (ornix) 2009-11-10 03:25:29.000-0600 Today i've installed 1.6.1.10rc2, there is the same bug there. By: ornix (ornix) 2009-11-20 05:48:38.000-0600 Now i'm looking at channel debug, i see the following differences: 1.6.1.10 (buggy behavior): -- <H323/sibirtelecom-1> Playing 'busy-cycl0.alaw' (language 'en') <<<<<<<<<<<<<-------Here i've hit * (an asterisk-key)---------------->>>>>>>>> << [ TYPE: Null Frame (5) SUBCLASS: N/A (0) ] [H323/sibirtelecom-1] << [ TYPE: DTMF End (1) SUBCLASS: * (42) ] [H323/sibirtelecom-1] -- Auto fallthrough, channel 'H323/sibirtelecom-1' status is 'BUSY' 1.6.1.4 (normal behavior): -- <H323/sibirtelecom-6> Playing 'busy-cycl0.alaw' (language 'en') <<<<<<<<<<<<<-------Here i've hit * (an asterisk-key)---------------->>>>>>>>> << [ TYPE: Unknown Frametype '10' (10) SUBCLASS: Unknown Subclass (127) ] [H323/sibirtelecom-6] << [ TYPE: DTMF End (1) SUBCLASS: * (42) ] [H323/sibirtelecom-6] == CDR updated on H323/sibirtelecom-6 -- Executing [*@callback:1] ResetCDR("H323/sibirtelecom-6", "w") in new stack By: ornix (ornix) 2009-12-01 21:30:58.000-0600 1.6.1.11. No changes. By: Tilghman Lesher (tilghman) 2009-12-08 15:08:37.000-0600 I haven't been able to reproduce. I reproduced your dialplan, except that I'm using SIP, because I haven't got an H323 channel to test with: -- Attempting call on Local/103@qqq for s@callback:1 (Retry 1) -- Executing [103@qqq:1] Macro("Local/103@qqq-b498;2", "cb-sip,103") in new stack -- Executing [s@macro-cb-sip:1] NoCDR("Local/103@qqq-b498;2", "") in new stack -- Executing [s@macro-cb-sip:2] Set("Local/103@qqq-b498;2", "CALLERID(num)=3833540661") in new stack -- Executing [s@macro-cb-sip:3] Dial("Local/103@qqq-b498;2", "SIP/103,,Tg") in new stack == Using SIP RTP CoS mark 5 == Using SIP VRTP CoS mark 6 -- Called 103 -- SIP/103-00000000 is ringing -- SIP/103-00000000 answered Local/103@qqq-b498;2 > Channel Local/103@qqq-b498;1 was answered. -- Executing [s@callback:1] Answer("Local/103@qqq-b498;1", "") in new stack -- Executing [s@callback:2] Set("Local/103@qqq-b498;1", "CLID=2487305") in new stack -- Executing [s@callback:3] Set("Local/103@qqq-b498;1", "CALLERID(name)=2487305") in new stack -- Executing [s@callback:4] Set("Local/103@qqq-b498;1", "TIMEOUT(digit)=6") in new stack -- Digit timeout set to 6.000 -- Executing [s@callback:5] WaitExten("Local/103@qqq-b498;1", "1") in new stack [Dec 8 15:05:16] WARNING[3828]: channel.c:2445 ast_waitfordigit_full: Unexpected control subclass '-1' == Spawn extension (macro-cb-sip, s, 3) exited non-zero on 'Local/103@qqq-b498;2' in macro 'cb-sip' == Spawn extension (qqq, 103, 1) exited non-zero on 'Local/103@qqq-b498;2' -- Timeout on SIP/103-00000000, continuing... -- Executing [s@callback:6] BackGround("SIP/103-00000000", "tt-weasels") in new stack -- <SIP/103-00000000> Playing 'tt-weasels.gsm' (language 'en') -- Executing [s@callback:7] WaitExten("SIP/103-00000000", "30") in new stack == CDR updated on SIP/103-00000000 -- Executing [*@callback:1] ResetCDR("SIP/103-00000000", "w") in new stack -- Executing [*@callback:2] Goto("SIP/103-00000000", "callback,s,5") in new stack -- Goto (callback,s,5) -- Executing [s@callback:5] WaitExten("SIP/103-00000000", "1") in new stack -- Timeout on SIP/103-00000000, continuing... -- Executing [s@callback:6] BackGround("SIP/103-00000000", "tt-weasels") in new stack -- <SIP/103-00000000> Playing 'tt-weasels.gsm' (language 'en') -- Executing [s@callback:7] WaitExten("SIP/103-00000000", "30") in new stack == CDR updated on SIP/103-00000000 -- Executing [*@callback:1] ResetCDR("SIP/103-00000000", "w") in new stack -- Executing [*@callback:2] Goto("SIP/103-00000000", "callback,s,5") in new stack -- Goto (callback,s,5) -- Executing [s@callback:5] WaitExten("SIP/103-00000000", "1") in new stack -- Timeout on SIP/103-00000000, continuing... -- Executing [s@callback:6] BackGround("SIP/103-00000000", "tt-weasels") in new stack -- <SIP/103-00000000> Playing 'tt-weasels.gsm' (language 'en') [Dec 8 15:05:31] DEBUG[3765]: pbx_spool.c:405 scan_service: Delaying retry since we're currently running '/var/spool/asterisk/outgoing/callfile' -- Executing [s@callback:7] WaitExten("SIP/103-00000000", "30") in new stack == Spawn extension (callback, s, 7) exited non-zero on 'SIP/103-00000000' [Dec 8 15:05:32] NOTICE[3828]: pbx_spool.c:348 attempt_thread: Call completed to Local/103@qqq What am I missing? By: ornix (ornix) 2009-12-08 22:14:40.000-0600 To reproduce the bug, you should Dial some extension, receive s-BUSY from it: [macro-internalcall-with-redirect-callback] exten => s,1,Dial(SIP/${ARG1},20,jgtedH) exten => s,n,Goto(s-${DIALSTATUS},1) exten => s-BUSY,1,Background(busy-cycl0) exten => s-BUSY,2,Goto(${CONTEXT},s,1) and while s-BUSY,1,Background(busy-cycl0) is executing, hit "*". By: Tilghman Lesher (tilghman) 2009-12-10 13:11:55.000-0600 You're missing a critical part of your dialplan. How is that macro even getting executed? It's not ever called from the part of the dialplan that you posted. By: ornix (ornix) 2009-12-10 20:44:56.000-0600 Sorry, i've really forgoten it. The extension, dialed with [macro-internalcall-with-redirect-callback] from context [callback], is SIP/115. [callback] exten => s,1,Answer() exten => s,n,Set(CLID=${CALLERID(num)}) exten => s,n,Set(CALLERID(all)=${CLID}) exten => s,n,Set(TIMEOUT(digit)=6) exten => s,n,Waitexten(1) exten => s,n,Background(naber_vnutr_nomer) exten => s,n,Waitexten(30) exten => s,n,Background(ostalos-10) exten => s,n,Background(otschet) exten => s,n,Hangup() ... exten => 115#,1,Macro(internalcall-with-redirect-callback,115,2487305) ... exten => fax,1,Goto(fax,s,1) exten => *,1,ResetCDR(w) exten => *,n,Goto(${CONTEXT},s,5) exten => t,1,Hangup() exten => i,1,Background(num-invalid) exten => i,2,Goto(${CONTEXT},s,7) By: Tilghman Lesher (tilghman) 2009-12-16 23:18:20.000-0600 Still completely unable to reproduce this: -- Attempting call on Local/103@qqq for s@callback:1 (Retry 1) -- Executing [103@qqq:1] Macro("Local/103@qqq-0ac6;2", "cb-sip,103") in new stack -- Executing [s@macro-cb-sip:1] NoCDR("Local/103@qqq-0ac6;2", "") in new stack -- Executing [s@macro-cb-sip:2] Set("Local/103@qqq-0ac6;2", "CALLERID(num)=3833540661") in new stack -- Executing [s@macro-cb-sip:3] Dial("Local/103@qqq-0ac6;2", "SIP/103,,Tg") in new stack == Using SIP RTP CoS mark 5 == Using SIP VRTP CoS mark 6 -- Called 103 -- SIP/103-00000001 is ringing -- SIP/103-00000001 answered Local/103@qqq-0ac6;2 > Channel Local/103@qqq-0ac6;1 was answered. -- Executing [s@callback:1] Answer("Local/103@qqq-0ac6;1", "") in new stack -- Executing [s@callback:2] Set("Local/103@qqq-0ac6;1", "CLID=2487305") in new stack -- Executing [s@callback:3] Set("Local/103@qqq-0ac6;1", "CALLERID(name)=2487305") in new stack -- Executing [s@callback:4] Set("Local/103@qqq-0ac6;1", "TIMEOUT(digit)=6") in new stack -- Digit timeout set to 6.000 -- Executing [s@callback:5] WaitExten("Local/103@qqq-0ac6;1", "1") in new stack [Dec 16 23:14:57] WARNING[1444]: channel.c:2445 ast_waitfordigit_full: Unexpected control subclass '-1' == Spawn extension (macro-cb-sip, s, 3) exited non-zero on 'Local/103@qqq-0ac6;2' in macro 'cb-sip' == Spawn extension (qqq, 103, 1) exited non-zero on 'Local/103@qqq-0ac6;2' -- Timeout on SIP/103-00000001, continuing... -- Executing [s@callback:6] BackGround("SIP/103-00000001", "tt-weasels") in new stack -- <SIP/103-00000001> Playing 'tt-weasels.gsm' (language 'en') -- Executing [s@callback:7] WaitExten("SIP/103-00000001", "30") in new stack == CDR updated on SIP/103-00000001 -- Executing [115@callback:1] Macro("SIP/103-00000001", "internalcall-with-redirect-callback,6039,2487305") in new stack -- Executing [s@macro-internalcall-with-redirect-callback:1] Dial("SIP/103-00000001", "SIP/6039,20,jgtedH") in new stack == Using SIP RTP CoS mark 5 == Using SIP VRTP CoS mark 6 [Dec 16 23:15:04] WARNING[1444]: chan_sip.c:4943 create_addr: No such host: 6039 [Dec 16 23:15:04] WARNING[1444]: app_dial.c:1547 dial_exec_full: Unable to create channel of type 'SIP' (cause 20 - Unknown) == Everyone is busy/congested at this time (1:0/0/1) -- Executing [s@macro-internalcall-with-redirect-callback:2] Goto("SIP/103-00000001", "s-BUSY,1") in new stack -- Goto (macro-internalcall-with-redirect-callback,s-BUSY,1) -- Executing [s-BUSY@macro-internalcall-with-redirect-callback:1] BackGround("SIP/103-00000001", "tt-weasels") in new stack -- <SIP/103-00000001> Playing 'tt-weasels.gsm' (language 'en') -- Executing [s-BUSY@macro-internalcall-with-redirect-callback:2] Goto("SIP/103-00000001", "macro-internalcall-with-redirect-callback,s,1") in new stack -- Goto (macro-internalcall-with-redirect-callback,s,1) -- Executing [s@macro-internalcall-with-redirect-callback:1] Dial("SIP/103-00000001", "SIP/6039,20,jgtedH") in new stack == Using SIP RTP CoS mark 5 == Using SIP VRTP CoS mark 6 [Dec 16 23:15:07] WARNING[1444]: chan_sip.c:4943 create_addr: No such host: 6039 [Dec 16 23:15:07] WARNING[1444]: app_dial.c:1547 dial_exec_full: Unable to create channel of type 'SIP' (cause 20 - Unknown) == Everyone is busy/congested at this time (1:0/0/1) -- Executing [s@macro-internalcall-with-redirect-callback:2] Goto("SIP/103-00000001", "s-BUSY,1") in new stack -- Goto (macro-internalcall-with-redirect-callback,s-BUSY,1) -- Executing [s-BUSY@macro-internalcall-with-redirect-callback:1] BackGround("SIP/103-00000001", "tt-weasels") in new stack -- <SIP/103-00000001> Playing 'tt-weasels.gsm' (language 'en') ... [Dec 16 23:15:17] NOTICE[1444]: pbx_spool.c:348 attempt_thread: Call completed to Local/103@qqq core show version Asterisk SVN-branch-1.6.1-r233730 built by tilghman @ gadolinium.jeffandtilghman.foo on a i686 running Linux on 2009-06-01 15:40:13 UTC By: Tilghman Lesher (tilghman) 2009-12-16 23:40:26.000-0600 Okay, finally reproduced. Patch uploaded and ready for testing. Please confirm whether or not this patch fixes it for you. Patch is against 1.6.1. By: ornix (ornix) 2009-12-17 00:31:44.000-0600 tilghman, thanks a lot! Your patch has fixed the problem. Will this patch included in 1.6.1.12 ? By: Digium Subversion (svnbot) 2009-12-17 11:17:53.000-0600 Repository: asterisk Revision: 235421 U branches/1.4/main/pbx.c ------------------------------------------------------------------------ r235421 | tilghman | 2009-12-17 11:17:52 -0600 (Thu, 17 Dec 2009) | 8 lines Use context from which Macro is executed, not macro context, if applicable. Also, ensure that the extension COULD match, not just that it won't match more. (closes issue ASTERISK-15021) Reported by: OrNix Patches: 20091216__issue16113.diff.txt uploaded by tilghman (license 14) Tested by: OrNix ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=235421 By: Digium Subversion (svnbot) 2009-12-17 11:19:08.000-0600 Repository: asterisk Revision: 235422 _U trunk/ U trunk/main/pbx.c ------------------------------------------------------------------------ r235422 | tilghman | 2009-12-17 11:19:08 -0600 (Thu, 17 Dec 2009) | 15 lines Merged revisions 235421 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r235421 | tilghman | 2009-12-17 11:17:51 -0600 (Thu, 17 Dec 2009) | 8 lines Use context from which Macro is executed, not macro context, if applicable. Also, ensure that the extension COULD match, not just that it won't match more. (closes issue ASTERISK-15021) Reported by: OrNix Patches: 20091216__issue16113.diff.txt uploaded by tilghman (license 14) Tested by: OrNix ........ ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=235422 By: Digium Subversion (svnbot) 2009-12-17 11:24:29.000-0600 Repository: asterisk Revision: 235423 _U branches/1.6.0/ U branches/1.6.0/main/pbx.c ------------------------------------------------------------------------ r235423 | tilghman | 2009-12-17 11:24:29 -0600 (Thu, 17 Dec 2009) | 22 lines Merged revisions 235422 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r235422 | tilghman | 2009-12-17 11:19:08 -0600 (Thu, 17 Dec 2009) | 15 lines Merged revisions 235421 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r235421 | tilghman | 2009-12-17 11:17:51 -0600 (Thu, 17 Dec 2009) | 8 lines Use context from which Macro is executed, not macro context, if applicable. Also, ensure that the extension COULD match, not just that it won't match more. (closes issue ASTERISK-15021) Reported by: OrNix Patches: 20091216__issue16113.diff.txt uploaded by tilghman (license 14) Tested by: OrNix ........ ................ ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=235423 By: Digium Subversion (svnbot) 2009-12-17 11:24:39.000-0600 Repository: asterisk Revision: 235424 _U branches/1.6.1/ U branches/1.6.1/main/pbx.c ------------------------------------------------------------------------ r235424 | tilghman | 2009-12-17 11:24:38 -0600 (Thu, 17 Dec 2009) | 22 lines Merged revisions 235422 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r235422 | tilghman | 2009-12-17 11:19:08 -0600 (Thu, 17 Dec 2009) | 15 lines Merged revisions 235421 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r235421 | tilghman | 2009-12-17 11:17:51 -0600 (Thu, 17 Dec 2009) | 8 lines Use context from which Macro is executed, not macro context, if applicable. Also, ensure that the extension COULD match, not just that it won't match more. (closes issue ASTERISK-15021) Reported by: OrNix Patches: 20091216__issue16113.diff.txt uploaded by tilghman (license 14) Tested by: OrNix ........ ................ ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=235424 By: Digium Subversion (svnbot) 2009-12-17 11:24:50.000-0600 Repository: asterisk Revision: 235425 _U branches/1.6.2/ U branches/1.6.2/main/pbx.c ------------------------------------------------------------------------ r235425 | tilghman | 2009-12-17 11:24:50 -0600 (Thu, 17 Dec 2009) | 22 lines Merged revisions 235422 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r235422 | tilghman | 2009-12-17 11:19:08 -0600 (Thu, 17 Dec 2009) | 15 lines Merged revisions 235421 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r235421 | tilghman | 2009-12-17 11:17:51 -0600 (Thu, 17 Dec 2009) | 8 lines Use context from which Macro is executed, not macro context, if applicable. Also, ensure that the extension COULD match, not just that it won't match more. (closes issue ASTERISK-15021) Reported by: OrNix Patches: 20091216__issue16113.diff.txt uploaded by tilghman (license 14) Tested by: OrNix ........ ................ ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=235425 |