Summary: | ASTERISK-12175: [patch] MeetMe() can't use 'X' and 's' options at the same time | ||
Reporter: | Leif Madsen (lmadsen) | Labels: | |
Date Opened: | 2008-06-11 12:48:47 | Date Closed: | 2008-06-13 11:39:09 |
Priority: | Minor | Regression? | No |
Status: | Closed/Complete | Components: | Applications/app_meetme |
Versions: | Frequency of Occurrence | ||
Related Issues: | |||
Environment: | Attachments: | ( 0) 20080611__bug12836.diff.txt | |
Description: | From the documentation: *CLI> core show application MeetMe 'X' -- allow user to exit the conference by entering a valid single digit extension ${MEETME_EXIT_CONTEXT} or the current context if that variable is not defined. 's' -- Present menu (user or admin) when '*' is received ('send' to menu) When using the 's' option by itself, everything works fine. When using the 'X' option by itself, everything works fine. But when you enable both 's' and 'X' at the same time, it appears the 'X' steps over the 's' option, and no longer allows the 's' option to present a menu when pressing the '*' key. When both 's' and 'X' are enabled however, the 'X' option still functions as normal. ****** ADDITIONAL INFORMATION ****** [macro-adminConferenceJoin] ; This macro uses 2 other contexts and an AGI to allow an administrator to dial an ; endpoint and add them to the conference ; ; ACCEPT: ARG1 --> conference number to join ; ; Depends on contexts: ; * addMemberToConference ; * clientJoiningConference ; exten => s,1,Verbose(1,Manager joining the conference now) exten => s,n,Set(CONF_TO_JOIN=${ARG1}) exten => s,n,Set(MEETME_EXIT_CONTEXT=addMemberToConference) exten => s,n,MeetMe(${CONF_TO_JOIN},d1Xa) exten => s,n,Hangup() [addMemberToConference] exten => 5,1,Verbose(1,Perform some logic here) exten => 5,n,... | ||
Comments: | By: Leif Madsen (lmadsen) 2008-06-11 12:50:58 I think that unless MEETME_EXIT_CONTEXT contains: exten => *,1,Verbose(1,Do something here) that the 's' option should still work. By: Leif Madsen (lmadsen) 2008-06-11 17:36:25 I'm gonna test this now. By: Leif Madsen (lmadsen) 2008-06-11 18:00:26 This seems to work now. However, I'm not sure if this is an effect of the patch (probably not), or an unrelated bug, but should the 'menu' exit immediately after changing an option, or as soon as the menu is done playing? i.e. it says press 8 to exit, but as soon as the prompt is done playing, it goes back into the conference. Perhaps this is a discussion for the -dev list? Either way -- this patch works and can go into 1.4 branch & 1.6 & trunk By: Leif Madsen (lmadsen) 2008-06-11 18:00:50 FYI: I tested this against 1.4 latest branch By: Digium Subversion (svnbot) 2008-06-12 10:12:03 Repository: asterisk Revision: 122137 U branches/1.4/apps/app_meetme.c ------------------------------------------------------------------------ r122137 | tilghman | 2008-06-12 10:12:01 -0500 (Thu, 12 Jun 2008) | 8 lines Flipflop the sections for two options, since the section for 'X' (exit context) may otherwise absorb keypresses meant for 's' (admin/user menu). (closes issue ASTERISK-12175) Reported by: blitzrage Patches: 20080611__bug12836.diff.txt uploaded by Corydon76 (license 14) Tested by: blitzrage ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=122137 By: Digium Subversion (svnbot) 2008-06-12 10:19:23 Repository: asterisk Revision: 122174 _U trunk/ U trunk/apps/app_meetme.c ------------------------------------------------------------------------ r122174 | tilghman | 2008-06-12 10:19:22 -0500 (Thu, 12 Jun 2008) | 16 lines Merged revisions 122137 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r122137 | tilghman | 2008-06-12 10:18:39 -0500 (Thu, 12 Jun 2008) | 8 lines Flipflop the sections for two options, since the section for 'X' (exit context) may otherwise absorb keypresses meant for 's' (admin/user menu). (closes issue ASTERISK-12175) Reported by: blitzrage Patches: 20080611__bug12836.diff.txt uploaded by Corydon76 (license 14) Tested by: blitzrage ........ ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=122174 By: Digium Subversion (svnbot) 2008-06-12 10:20:54 Repository: asterisk Revision: 122180 _U branches/1.6.0/ U branches/1.6.0/apps/app_meetme.c ------------------------------------------------------------------------ r122180 | tilghman | 2008-06-12 10:20:53 -0500 (Thu, 12 Jun 2008) | 24 lines Merged revisions 122174 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r122174 | tilghman | 2008-06-12 10:26:07 -0500 (Thu, 12 Jun 2008) | 16 lines Merged revisions 122137 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r122137 | tilghman | 2008-06-12 10:18:39 -0500 (Thu, 12 Jun 2008) | 8 lines Flipflop the sections for two options, since the section for 'X' (exit context) may otherwise absorb keypresses meant for 's' (admin/user menu). (closes issue ASTERISK-12175) Reported by: blitzrage Patches: 20080611__bug12836.diff.txt uploaded by Corydon76 (license 14) Tested by: blitzrage ........ ................ ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=122180 By: Digium Subversion (svnbot) 2008-06-13 11:39:09 Repository: asterisk Revision: 122590 _U team/murf/CDRfix4/ U team/murf/CDRfix4/CHANGES U team/murf/CDRfix4/acinclude.m4 U team/murf/CDRfix4/apps/app_chanspy.c A team/murf/CDRfix4/apps/app_dahdibarge.c A team/murf/CDRfix4/apps/app_dahdiras.c A team/murf/CDRfix4/apps/app_dahdiscan.c U team/murf/CDRfix4/apps/app_dial.c U team/murf/CDRfix4/apps/app_disa.c U team/murf/CDRfix4/apps/app_flash.c U team/murf/CDRfix4/apps/app_forkcdr.c U team/murf/CDRfix4/apps/app_getcpeid.c U team/murf/CDRfix4/apps/app_meetme.c U team/murf/CDRfix4/apps/app_page.c U team/murf/CDRfix4/apps/app_parkandannounce.c U team/murf/CDRfix4/apps/app_read.c U team/murf/CDRfix4/apps/app_rpt.c D team/murf/CDRfix4/apps/app_zapbarge.c D team/murf/CDRfix4/apps/app_zapras.c D team/murf/CDRfix4/apps/app_zapscan.c U team/murf/CDRfix4/build_tools/menuselect-deps.in A team/murf/CDRfix4/channels/chan_dahdi.c U team/murf/CDRfix4/channels/chan_iax2.c U team/murf/CDRfix4/channels/chan_mgcp.c U team/murf/CDRfix4/channels/chan_misdn.c D team/murf/CDRfix4/channels/chan_zap.c A team/murf/CDRfix4/codecs/codec_dahdi.c D team/murf/CDRfix4/codecs/codec_zap.c U team/murf/CDRfix4/configure U team/murf/CDRfix4/configure.ac U team/murf/CDRfix4/contrib/utils/zones2indications.c U team/murf/CDRfix4/funcs/func_cdr.c U team/murf/CDRfix4/funcs/func_channel.c U team/murf/CDRfix4/include/asterisk/autoconfig.h.in U team/murf/CDRfix4/include/asterisk/cdr.h U team/murf/CDRfix4/include/asterisk/channel.h A team/murf/CDRfix4/include/asterisk/dahdi_compat.h U team/murf/CDRfix4/include/asterisk/indications.h U team/murf/CDRfix4/include/asterisk/options.h U team/murf/CDRfix4/main/app.c U team/murf/CDRfix4/main/asterisk.c U team/murf/CDRfix4/main/cdr.c U team/murf/CDRfix4/main/channel.c U team/murf/CDRfix4/main/file.c U team/murf/CDRfix4/main/indications.c U team/murf/CDRfix4/main/loader.c U team/murf/CDRfix4/makeopts.in U team/murf/CDRfix4/pbx/pbx_config.c U team/murf/CDRfix4/res/res_features.c U team/murf/CDRfix4/res/res_indications.c U team/murf/CDRfix4/res/res_musiconhold.c U team/murf/CDRfix4/res/snmp/agent.c ------------------------------------------------------------------------ r122590 | murf | 2008-06-13 11:39:02 -0500 (Fri, 13 Jun 2008) | 108 lines Merged revisions 122046,122127,122130,122137,122208,122259,122311,122314,122589 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r122046 | murf | 2008-06-12 07:47:34 -0600 (Thu, 12 Jun 2008) | 37 lines (closes issue ASTERISK-10252) Reported by: arkadia Tested by: murf, arkadia Options added to forkCDR() app and the CDR() func to remove some roadblocks for CDR applications. The "show application ForkCDR" output was upgraded to more fully explain the inner workings of forkCDR. The A option was added to forkCDR to force the CDR system to NOT change the disposition on the original CDR, after the fork. This involves ast_cdr_answer, _busy, _failed, and so on. The T option was added to forkCDR to force obedience of the cdr LOCKED flag in the ast_cdr_end, all the disposition changing funcs (ast_cdr_answer, etc), and in the ast_cdr_setvar func. The CHANGES file was updated to explain ALL the new options added to satisfy this bug report (and some requests made verbally and via email, irc, etc, over the past months/year) The 's' option was added to the CDR() func, to force it to skip LOCKED cdr's in the chain. Again, the new options should be totally transparent to existing apps! Current behavior of CDR, forkCDR, and the rest of the CDR system should not change one little bit. Until you add the new options, at least! ........ r122127 | murf | 2008-06-12 08:51:44 -0600 (Thu, 12 Jun 2008) | 1 line Arkadia tried to warn me, but the code added to ast_cdr_busy, _failed, and _noanswer was redundant. Didn't spot it until I was resolving conflicts in trunk. Ugh. Redundant code removed. It wasn't harmful. Just dumb. ........ r122130 | tilghman | 2008-06-12 09:11:30 -0600 (Thu, 12 Jun 2008) | 4 lines Occasionally, the alertpipe loses its nonblocking status, so detect and correct that situation before it causes a deadlock. (Reported and tested by ctooley via #asterisk-dev) ........ r122137 | tilghman | 2008-06-12 09:18:39 -0600 (Thu, 12 Jun 2008) | 8 lines Flipflop the sections for two options, since the section for 'X' (exit context) may otherwise absorb keypresses meant for 's' (admin/user menu). (closes issue ASTERISK-12175) Reported by: blitzrage Patches: 20080611__bug12836.diff.txt uploaded by Corydon76 (license 14) Tested by: blitzrage ........ r122208 | jpeeler | 2008-06-12 09:46:08 -0600 (Thu, 12 Jun 2008) | 5 lines (closes issue ASTERISK-11622) Reported by: davidw Patch by: Corydon76, modified by me to work properly with ParkAndAnnounce app ........ r122259 | russell | 2008-06-12 12:22:44 -0600 (Thu, 12 Jun 2008) | 3 lines Fix some race conditions that cause ast_assert() to report that chan_iax2 tried to remove an entry that wasn't in the scheduler ........ r122311 | mmichelson | 2008-06-12 12:50:58 -0600 (Thu, 12 Jun 2008) | 9 lines Properly play a holdtime message if the announce-holdtime option is set to "once." (closes issue ASTERISK-12180) Reported by: ramonpeek Patches: patch001.diff uploaded by ramonpeek (license 266) ........ r122314 | jpeeler | 2008-06-12 13:08:20 -0600 (Thu, 12 Jun 2008) | 2 lines Adds DAHDI support alongside Zaptel. DAHDI usage favored, but all Zap stuff should continue working. Release announcement to follow. ........ r122589 | twilson | 2008-06-13 10:29:07 -0600 (Fri, 13 Jun 2008) | 7 lines This should fix the behavior of the 'T' dial feature being passed incorrectly to the transferee when builtin_atxfers are used. Also, doing a builtin_atxfer to parking was broken and is fixed here as well. (closes issue ASTERISK-11352) Reported by: sergee Tested by: otherwiseguy ........ ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=122590 |