summaryrefslogtreecommitdiff
path: root/apps
AgeCommit message (Collapse)Author
2011-11-02Add note about how Authenticate() application with option 'd' works.Leif Madsen
(closes issue ASTERISK-17422) Reported by: Leif Madsen ........ Merged revisions 343102 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 343103 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@343104 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-11-02Modify comments in MeetMe application documentation about DAHDI.Kevin P. Fleming
The MeetMe application documentation has some comments about usage of DAHDI, and they were a bit outdated relative to modern DAHDI releases. This patch changes the comment to just tell the user that a functional DAHDI timing source is required, and no longer mention 'dahdi_dummy', since that module does not exist in current DAHDI releases. ........ Merged revisions 342990 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 342991 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342992 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-25Use int for storing ao2_container_count instad of size_tTerry Wilson
AST-676 ........ Merged revisions 342435 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 342436 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342437 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-25Simplify queue membercount codeTerry Wilson
Despite an ominous sounding comment stating that membercount was for "logged in" members only and thus we couldn't use ao2_container_count(), I could not find a single place in the code where that seemed to be accurate. The only time we decremented membercount was when we were marking something dead or actually removing it. The only places we incremented it were either after ao2_link(), or trying to correct for having set it to 0 during a reload. In every case where we were correcting the value, it seemed that we were trying to make the count actually match what ao2_container_count() would return. The only place I could find where we made a determination about something being "logged in" or not, we didn't trust the membercount, but instead looked at devicestate, paused, etc. This patch removes membercount, replaces its use with ao2_container_count, and manually adds the results of ao2_container_count to a "membercount" field for ast_data queue query results. This patch also would fix AST-676, but as it is slightly riskier than the previously committed fix, the two commits have been made separately. Reivew: https://reviewboard.asterisk.org/r/1541/ ........ Merged revisions 342383 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 342384 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342385 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-25Properly update membercount for reloaded membersTerry Wilson
Since q->membercount is set to 0 before reloading, it is important to increment it again for reloaded members as well as added. (closes issue AST-676) Review: https://reviewboard.asterisk.org/r/1541/ ........ Merged revisions 342380 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 342381 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342382 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-24Fix use of OBJ_KEY in Queue application.Richard Mudgett
To use the new OBJ_KEY flag, the container hash and compare callback functions must be updated to support OBJ_KEY. Otherwise, bad things happen. (issue ASTERISK-14769) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342112 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-24queues container needs locking when using the OBJ_NOLOCK flagGregory Nietsky
........ Merged revisions 342017 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342018 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-23Remove some ref leaks and a return without unlock.Gregory Nietsky
There some resource leaks introduced in asterisk 10 make sure that locks are not held on return and we release ref's held. ........ Merged revisions 341972 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341973 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-23Whitespace Fixups / Add BracesGregory Nietsky
This janitorial patch is related to work on RB1538 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341923 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-20Merged revisions 341580 via svnmerge from Gregory Nietsky
https://origsvn.digium.com/svn/asterisk/branches/10 ........ r341580 | irroot | 2011-10-20 19:13:23 +0200 (Thu, 20 Oct 2011) | 15 lines Add option to check state when state is unknown r341486 reverts r325483 this is a rework of the patch. optimize to minimize load. add option check_state_unknown to control whether a member with unknown device state is checked there is a small % chance that calls will be sent to the member when they on a call. app_queue will see a device with unknown state as available and does not try verify the state without this option enabled. Review: https://reviewboard.asterisk.org/r/1535/ ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341583 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-19Merged revisions 341486 via svnmerge from Matthew Nicholson
https://origsvn.digium.com/svn/asterisk/branches/10 ........ r341486 | mnicholson | 2011-10-19 16:23:17 -0500 (Wed, 19 Oct 2011) | 18 lines Fix a performance regression introduced in r325483. The regression was caused by a call to ast_parse_device_state() in app_queue's ring_entry() function. The ast_parse_device_state() function eventually calls ast_channel_get_full() with a channel name prefix which causes it to walk the channel list causing massive lock contention and slow downs. This patch fixes the regression by removing the call to ast_parase_device_state() which should be unnecessary. Queue member device state should be maintained by device state events. Some users have seen instances where busy agents were called when they shouldn't have, which is the reason the call to ast_parse_device_state() was added. That change appears to have resolved that issue but also causes this performance regression. There may still be issues with queue member status, and if so, alternative methods should be investigated to resolve them. AST-695 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341487 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-17Multiple revisions 341108,341112Paul Belanger
........ r341108 | pabelanger | 2011-10-17 12:22:19 -0400 (Mon, 17 Oct 2011) | 2 lines Voicemail compiler flags are 'core' support ........ r341112 | pabelanger | 2011-10-17 12:23:33 -0400 (Mon, 17 Oct 2011) | 2 lines Fix previous commit ........ Merged revisions 341108,341112 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 341122 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341126 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-12Update MeetMe p and X option documentation when interacting with the s option.Richard Mudgett
ASTERISK-12175 changed the p and X options to not interfere with the s option when they are used together. It makes more sense for the s option to have priority for the DTMF '*' key since it cannot change its activation code. Otherwise, you could not use option s with the p or X options. JIRA AST-671 ........ Merged revisions 340470 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 340471 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340472 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-10Merged revisions 340109 via svnmerge from Matthew Nicholson
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r340109 | mnicholson | 2011-10-10 09:15:41 -0500 (Mon, 10 Oct 2011) | 18 lines Merged revisions 340108 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r340108 | mnicholson | 2011-10-10 09:14:48 -0500 (Mon, 10 Oct 2011) | 11 lines Load the proper XML documentation when multiple modules document the same application. This patch adds an optional "module" attribute to the XML documentation spec that allows the documentation processor to match apps with identical names from different modules to their documentation. This patch also fixes a number of bugs with the documentation processor and should make it a little more efficient. Support for multiple languages has also been properly implemented. ASTERISK-18130 Review: https://reviewboard.asterisk.org/r/1485/ ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340110 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-07Merged revisions 339777 via svnmerge from Richard Mudgett
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r339777 | rmudgett | 2011-10-07 14:36:24 -0500 (Fri, 07 Oct 2011) | 12 lines Merged revisions 339776 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r339776 | rmudgett | 2011-10-07 14:34:55 -0500 (Fri, 07 Oct 2011) | 5 lines Initialize option flags for SendURL application. (closes issue ASTERISK-18574) Reported by: marcelloceschia ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339778 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-05Merged revisions 339512 via svnmerge from Richard Mudgett
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r339512 | rmudgett | 2011-10-05 12:01:46 -0500 (Wed, 05 Oct 2011) | 9 lines Merged revisions 339511 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r339511 | rmudgett | 2011-10-05 12:01:01 -0500 (Wed, 05 Oct 2011) | 1 line Fix Dial F option notes formatting. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339513 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-03Merged revisions 339145 via svnmerge from Leif Madsen
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r339145 | lmadsen | 2011-10-03 14:55:15 -0500 (Mon, 03 Oct 2011) | 13 lines Merged revisions 339144 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r339144 | lmadsen | 2011-10-03 14:54:52 -0500 (Mon, 03 Oct 2011) | 6 lines Make documentation for Dial() options 'F' and 'F()' more clear. (Closes issue ASTERISK-18646) Reported by: Physis Heckman Tested by: Richard Mudgett ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339146 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-28Add autopausebusy and autopauseunavail queue optionsTerry Wilson
Make it possible to autopause on a busy or unavailable response from a device. (closes issue ASTERISK-16112) Reported by: jlpedrosa Patches: autopausebusy.txt by twilson Review: https://reviewboard.asterisk.org/r/1399/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338187 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-28Updated for OSP Toolkit 4.0.0.TransNexus OSP Development
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338136 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-27Merged revisions 338085 via svnmerge from Paul Belanger
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r338085 | pabelanger | 2011-09-27 16:13:14 -0400 (Tue, 27 Sep 2011) | 9 lines Merged revisions 338084 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r338084 | pabelanger | 2011-09-27 16:10:13 -0400 (Tue, 27 Sep 2011) | 2 lines Upgrade app_macro to core ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338086 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-26Merged revisions 337974 via svnmerge from Richard Mudgett
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r337974 | rmudgett | 2011-09-26 14:35:23 -0500 (Mon, 26 Sep 2011) | 37 lines Merged revisions 337973 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r337973 | rmudgett | 2011-09-26 14:30:39 -0500 (Mon, 26 Sep 2011) | 30 lines Fix deadlock when using dummy channels. Dummy channels created by ast_dummy_channel_alloc() should be destoyed by ast_channel_unref(). Using ast_channel_release() needlessly grabs the channel container lock and can cause a deadlock as a result. * Analyzed use of ast_dummy_channel_alloc() and made use ast_channel_unref() when done with the dummy channel. (Primary reason for the reported deadlock.) * Made app_dial.c:dial_exec_full() not call ast_call() holding any channel locks. Chan_local could not perform deadlock avoidance correctly. (Potential deadlock exposed by this issue. Secondary reason for the reported deadlock since the held lock was part of the deadlock chain.) * Fixed some uses of ast_dummy_channel_alloc() not checking the returned channel pointer for failure. * Fixed some potential chan=NULL pointer usage in func_odbc.c. Protected by testing the bogus_chan value. * Fixed needlessly clearing a 1024 char auto array when setting the first char to zero is enough in manager.c:action_getvar(). (closes issue ASTERISK-18613) Reported by: Thomas Arimont Patches: jira_asterisk_18613_v1.8.patch (license #5621) patch uploaded by rmudgett Tested by: Thomas Arimont ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337975 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-23Merged revisions 337840 via svnmerge from Gregory Nietsky
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r337840 | irroot | 2011-09-23 10:39:22 +0200 (Fri, 23 Sep 2011) | 17 lines Merged revisions 337839 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r337839 | irroot | 2011-09-23 10:34:03 +0200 (Fri, 23 Sep 2011) | 11 lines Make sure a CDR is on the stack for call in the Queue. Only let update_cdr act on the last CDR in the stack. In some circumstances [Attended transfer to queue] a CDR record is not inserted for this call where it should. (closes issue ASTERISK-18567) Review: https://reviewboard.asterisk.org/r/1266 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337855 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-21More silly spacing changesTilghman Lesher
..... Merged revisions 337353 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ..... Merged revisions 337380 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337385 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-21................Tilghman Lesher
........ Dumb little spacing fix. ........ Merged revisions 337344 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ................ Merged revisions 337345 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337346 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-21Merged revisions 337261 via svnmerge from Gregory Nietsky
https://origsvn.digium.com/svn/asterisk/branches/10 ........ r337261 | irroot | 2011-09-21 12:42:06 +0200 (Wed, 21 Sep 2011) | 10 lines Adds a timeout argument to app_originate the default is 30s this will be used if the timout supplied is invalid or no timeout is supplied. Contributed by: jacco (thank you for the work) Review: https://reviewboard.asterisk.org/r/1310/ ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337262 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-20Merged revisions 337120 via svnmerge from Matthew Jordan
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r337120 | mjordan | 2011-09-20 17:49:36 -0500 (Tue, 20 Sep 2011) | 28 lines Merged revisions 337118 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r337118 | mjordan | 2011-09-20 17:38:54 -0500 (Tue, 20 Sep 2011) | 21 lines Fix for incorrect voicemail duration in external notifications This patch fixes an issue where the voicemail duration was being reported with a duration significantly less than the actual sound file duration. Voicemails that contained mostly silence were reporting the duration of only the sound in the file, as opposed to the duration of the file with the silence. This patch fixes this by having two durations reported in the __ast_play_and_record family of functions - the sound_duration and the actual duration of the file. The sound_duration, which is optional, now reports the duration of the sound in the file, while the actual full duration of the file is reported in the duration parameter. This allows the voicemail applications to use the sound_duration for minimum duration checking, while reporting the full duration to external parties if the voicemail is kept. (issue ASTERISK-2234) (closes issue ASTERISK-16981) Reported by: Mary Ciuciu, Byron Clark, Brad House, Karsten Wemheuer, KevinH Tested by: Matt Jordan Review: https://reviewboard.asterisk.org/r/1443 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337124 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-19Merged revisions 336717 via svnmerge from Jonathan Rose
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r336717 | jrose | 2011-09-19 15:16:23 -0500 (Mon, 19 Sep 2011) | 14 lines Merged revisions 336716 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r336716 | jrose | 2011-09-19 15:07:36 -0500 (Mon, 19 Sep 2011) | 7 lines Document applications that play audio and do not answer unanswered calls. This patch is part of an effort to document early media and its usage. If you are interested in contributing to this documentation effort, there are probably other applications worth documenting as well as an Asterisk wiki article at https://wiki.asterisk.org/wiki/display/AST/Early+Media+and+the+Progress+Application ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336732 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-19Merged revisions 336659 via svnmerge from Richard Mudgett
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r336659 | rmudgett | 2011-09-19 13:51:19 -0500 (Mon, 19 Sep 2011) | 38 lines Merged revisions 336658 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r336658 | rmudgett | 2011-09-19 13:46:40 -0500 (Mon, 19 Sep 2011) | 31 lines Made Dial d and H options no longer immediately auto-answer the calling leg. The Dial d and H options break DTMF attended transfer atxferdropcall option. 1) Party A calls party B. 2) Party B does a DTMF attended transfer to Party C. If the dialplan uses the Dial d or H options to call Party C then the Dial application answers the call immediately before initiating the call leg to Party C. The premature answer causes the transfer code to not invoke the atxferdropcall=no behavior for a blonde transfer since Party C has "answered". The transfer code thinks that Party B has "consulted" with Party C when Party B hangs up and completes the transfer to Party A. Party A now hears ringback until Party C actually answers. ASTERISK-13294 Dial d option. ASTERISK-11067 Dial H option to disconnect before answer. The referenced issues made Dial answer with the d and H options because many SIP and ISDN phones cannot send DTMF before the call is connected. * Made require the dialplan to control when or if the call needs to be answered to use the Dial application d and H options. (The call is no longer surprise answered when using the Dial d or H options.) Review: https://reviewboard.asterisk.org/r/1381/ JIRA AST-623 JIRA AST-666 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336662 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-15Merged revisions 336094 via svnmerge from Gregory Nietsky
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r336094 | irroot | 2011-09-15 17:54:46 +0200 (Thu, 15 Sep 2011) | 26 lines Merged revisions 336093 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r336093 | irroot | 2011-09-15 17:46:21 +0200 (Thu, 15 Sep 2011) | 20 lines Locking order in app_queue.c causes deadlocks. a channel lock must never be held with the queues container lock held. the deadlock occured on masquerade. the queues container lock is a relic of the past the old queue module lock. with ao2 there is no need to hold this lock when dealing with members this patch removes unneeded locks. (closes issue ASTERISK-18101) (closes issue ASTERISK-18487) Reported by: Paul Rolfe, Jason Legault Tested by: irroot, Jason Legault, Paul Rolfe Reviewed by: Matthew Nicholson Review: https://reviewboard.asterisk.org/r/1402/ ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336095 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-15Merged revisions 336042 via svnmerge from Olle Johansson
https://origsvn.digium.com/svn/asterisk/branches/10 ........ r336042 | oej | 2011-09-15 14:46:38 +0200 (Tor, 15 Sep 2011) | 12 lines Meetme: Introducing a new option "k" to kill a conference if there's only a single member left. When using Meetme as a modular call bridge from third party applications, it's handy to make it behave like a normal call bridge. When the second to last person exists, the last person will be kicked out of the conference when this option is enabled. (closes issue ASTERISK-18234) Review: https://reviewboard.asterisk.org/r/1376/ Patch by oej, sponsored by ClearIT, Solna, Sweden ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336043 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-13Merged revisions 335721 via svnmerge from Richard Mudgett
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r335721 | rmudgett | 2011-09-13 17:10:44 -0500 (Tue, 13 Sep 2011) | 9 lines Merged revisions 335720 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r335720 | rmudgett | 2011-09-13 17:10:15 -0500 (Tue, 13 Sep 2011) | 1 line Remove obsolete todo comment about PICKUPRESULT. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@335722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-12Merged revisions 335346 via svnmerge from Kinsey Moore
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r335346 | kmoore | 2011-09-12 09:22:15 -0500 (Mon, 12 Sep 2011) | 17 lines Merged revisions 335341 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r335341 | kmoore | 2011-09-12 09:21:17 -0500 (Mon, 12 Sep 2011) | 10 lines Ensure frames are not written to dialed channel if ringback is requested When a single channel was dialed and there was media to be forwarded to the calling channel, the media was written without regard for ringback causing silence to be heard in some circumstances. This regression was introduced when the meaning of "single" changed to mean only the number of channels dialed. (closes issue ASTERISK-18083) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@335354 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-09Merged revisions 335078 via svnmerge from Matthew Jordan
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r335078 | mjordan | 2011-09-09 11:27:01 -0500 (Fri, 09 Sep 2011) | 29 lines Merged revisions 335064 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r335064 | mjordan | 2011-09-09 11:09:09 -0500 (Fri, 09 Sep 2011) | 23 lines Updated SIP 484 handling; added Incomplete control frame When a SIP phone uses the dial application and receives a 484 Address Incomplete response, if overlapped dialing is enabled for SIP, then the 484 Address Incomplete is forwarded back to the SIP phone and the HANGUPCAUSE channel variable is set to 28. Previously, the Incomplete application dialplan logic was automatically triggered; now, explicit dialplan usage of the application is required. Additionally, this patch adds a new AST_CONTOL_FRAME type called AST_CONTROL_INCOMPLETE. If a channel driver receives this control frame, it is an indication that the dialplan expects more digits back from the device. If the device supports overlap dialing it should attempt to notify the device that the dialplan is waiting for more digits; otherwise, it can handle the frame in a manner appropriate to the channel driver. (closes issue ASTERISK-17288) Reported by: Mikael Carlsson Tested by: Matthew Jordan Review: https://reviewboard.asterisk.org/r/1416/ ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@335079 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-09Merged revisions 335014 via svnmerge from Gregory Nietsky
https://origsvn.digium.com/svn/asterisk/branches/10 ........ r335014 | irroot | 2011-09-09 09:23:53 +0200 (Fri, 09 Sep 2011) | 9 lines Move code for VALID_EXTEN from app_readexten to func_dialplan Mark VALID_EXTEN deprecated. Review: https://reviewboard.asterisk.org/r/1396/ ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@335015 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-07Merged revisions 334621 via svnmerge from Alec L Davis
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r334621 | alecdavis | 2011-09-07 20:14:50 +1200 (Wed, 07 Sep 2011) | 9 lines Merged revisions 334620 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r334620 | alecdavis | 2011-09-07 20:12:49 +1200 (Wed, 07 Sep 2011) | 2 lines peroid typo ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@334623 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-06Merged revisions 334455 via svnmerge from Gregory Nietsky
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r334455 | irroot | 2011-09-06 15:58:56 +0200 (Tue, 06 Sep 2011) | 18 lines Merged revisions 334453 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r334453 | irroot | 2011-09-06 15:48:03 +0200 (Tue, 06 Sep 2011) | 13 lines Make SQL query in app_voicemail.c portable LIMIT is not portable. Regression from r312212 (closes issue ASTERISK-18255) Reported by: Leif Madsen Tested by: Leif Madsen Review: https://reviewboard.asterisk.org/r/1415/ ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@334519 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-06Revert r334472 due to properties going missingGregory Nietsky
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@334515 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-06Merged revisions 334455 via svnmerge from Gregory Nietsky
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r334455 | irroot | 2011-09-06 15:58:56 +0200 (Tue, 06 Sep 2011) | 18 lines Merged revisions 334453 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r334453 | irroot | 2011-09-06 15:48:03 +0200 (Tue, 06 Sep 2011) | 13 lines Make SQL query in app_voicemail.c portable LIMIT is not portable. Regression from r312212 (closes issue ASTERISK-18255) Reported by: Leif Madsen Tested by: Leif Madsen Review: https://reviewboard.asterisk.org/r/1415/ ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@334472 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-29Merged revisions 333631 via svnmerge from Matthew Jordan
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r333631 | mjordan | 2011-08-29 12:12:55 -0500 (Mon, 29 Aug 2011) | 9 lines Merged revisions 333630 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r333630 | mjordan | 2011-08-29 12:11:15 -0500 (Mon, 29 Aug 2011) | 1 line Fixed improperly formatted TestEvent AMI message in app_voicemail ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@333632 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-26Merged revisions 333370 via svnmerge from Matthew Jordan
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r333370 | mjordan | 2011-08-26 10:58:37 -0500 (Fri, 26 Aug 2011) | 26 lines Merged revisions 333339 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r333339 | mjordan | 2011-08-26 08:36:36 -0500 (Fri, 26 Aug 2011) | 20 lines Bug fixes for voicemail user emailsubject / emailbody. This code change fixes a few issues with the voicemail user override of emailbody and emailsubject, including escaping the strings, potential memory leaks, and not overriding the voicemail defaults. Revision 325877 fixed this for ASTERISK-16795, but did not fix it for ASTERISK-16781. A subsequent check-in prevented 325877 from being applied to 10. This check-in resolves both issues, and applies the changes to 1.8, 10, and trunk. (closes issue ASTERISK-16781) Reported by: Sebastien Couture Tested by: mjordan (closes issue ASTERISK-16795) Reported by: mdeneen Tested by: mjordan Review: https://reviewboard.asterisk.org/r/1374 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@333371 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-23Merged revisions 333011 via svnmerge from Richard Mudgett
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r333011 | rmudgett | 2011-08-23 13:15:49 -0500 (Tue, 23 Aug 2011) | 19 lines Merged revisions 333010 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r333010 | rmudgett | 2011-08-23 13:14:01 -0500 (Tue, 23 Aug 2011) | 12 lines Memory Leak in app_queue The patch that was committed in the 1.6.x versions of Asterisk for ASTERISK-15862 actually fixed two issues. One was not applicable to 1.8 but the other is. queue_leak.patch fixes the portion applicable to 1.8. (closes issue ASTERISK-18265) Reported by: Fred Schroeder Patches: queue_leak.patch (license #5049) patch uploaded by mmichelson Tested by: Thomas Arimont ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@333014 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-22Merged revisions 332875,332878 via svnmerge from Richard Mudgett
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r332875 | rmudgett | 2011-08-22 14:41:03 -0500 (Mon, 22 Aug 2011) | 1 line Fix merge property. ................ r332878 | rmudgett | 2011-08-22 14:46:25 -0500 (Mon, 22 Aug 2011) | 25 lines Merged revisions 332874 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r332874 | rmudgett | 2011-08-22 14:32:19 -0500 (Mon, 22 Aug 2011) | 18 lines Reference leaks in app_queue. * Fixed load_realtime_queue() leaking a queue reference when it overwrites q when processing a realtime queue. (issue ASTERISK-18265) * Make join_queue() unreference the queue returned by load_realtime_queue() when it is done with the pointer. The load_realtime_queue() returns a reference to the just loaded realtime queue. * Fixed queues container reference leak in queues_data_provider_get(). * queue_unref() should not return q that was just unreferenced. * Made logic in __queues_show() and queues_data_provider_get() when calling load_realtime_queue() easier to understand. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@332881 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-22Merged revisions 332817 via svnmerge from Matthew Jordan
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r332817 | mjordan | 2011-08-22 13:15:51 -0500 (Mon, 22 Aug 2011) | 4 lines Review: https://reviewboard.asterisk.org/r/1364/ This update adds a new AMI event, TestEvent, which is enabled when the TEST_FRAMEWORK compiler flag is defined. It also adds initial usage of this event to app_voicemail. The TestEvent AMI event is used extensively by the voicemail tests in the Asterisk Test Suite. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@332844 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-19Merged revisions 332654 via svnmerge from Kinsey Moore
https://origsvn.digium.com/svn/asterisk/branches/10 ........ r332654 | kmoore | 2011-08-19 14:59:34 -0500 (Fri, 19 Aug 2011) | 8 lines Make CONFBRIDGE_INFO behave more nicely CONFBRIDGE_INFO doesn't behave as well in edge cases as MEETME_INFO. With this patch, CONFBRIDGE_INFO should behave in a much more reasonable manner when presented with invalid conferences and keywords. Review: https://reviewboard.asterisk.org/r/1359/ ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@332655 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-12Merged revisions 331775 via svnmerge from Matthew Nicholson
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r331775 | mnicholson | 2011-08-12 14:03:31 -0500 (Fri, 12 Aug 2011) | 17 lines Merged revisions 331774 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r331774 | mnicholson | 2011-08-12 14:01:27 -0500 (Fri, 12 Aug 2011) | 11 lines Unlock the channel before calling update_queue. Holding the channel lock when calling update_queue which attempts to lock the queue lock can cause a deadlock. This deadlock involves the following chain: 1. hold chan lock -> wait queue lock 2. hold queue lock -> wait agent list lock 3. hold agent list lock -> wait chan list lock 4. hold chan list lock -> wait chan lock ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331776 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-12Merged revisions 331644 via svnmerge from Jonathan Rose
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r331644 | jrose | 2011-08-12 11:18:57 -0500 (Fri, 12 Aug 2011) | 9 lines Merged revisions 331635 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r331635 | jrose | 2011-08-12 10:49:17 -0500 (Fri, 12 Aug 2011) | 1 line Fixes 32bit compilation warnings brought on by 331634 in app_dial and app_meetme ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331717 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-11Merged revisions 331579 via svnmerge from Jason Parker
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r331579 | qwell | 2011-08-11 16:54:54 -0500 (Thu, 11 Aug 2011) | 13 lines Merged revisions 331578 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r331578 | qwell | 2011-08-11 16:46:39 -0500 (Thu, 11 Aug 2011) | 6 lines Use proper values for 64-bit option flags. Also, reusing bits es no bueno, so change the value of a duplicate. (issue ASTERISK-18239) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331580 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-09Merged revisions 331265 via svnmerge from Richard Mudgett
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r331265 | rmudgett | 2011-08-09 18:12:49 -0500 (Tue, 09 Aug 2011) | 22 lines Merged revisions 331248 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r331248 | rmudgett | 2011-08-09 17:12:59 -0500 (Tue, 09 Aug 2011) | 15 lines Misc minor items found in code. * Add some reentrancy protection in pbx.c when creating the contexts_table hash table. * Fix inverted test in chan_sip.c conditional code. * Fix uninitialized variable and use of the wrong variable in chan_iax2.c. * Fix test of return value in app_parkandannounce.c. Explicitly testing for -1 is bad if the function does not actually return that value when it fails. * Fixup some comments and add some curly braces in features.c. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331266 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-08Log queue member name when state_interface is set for ADDMEMBER and ↵Kinsey Moore
REMOVEMEMBER events app_queue logs the events ADDMEMBER and REMOVEMEMBER with the agent field set to the interface value rather than the membername value when a member is added with a state_interface value set. However all other member related queue events are logged with the membername when a state_interface is set. This patch makes these fields optionally more consistent and correct. (closes issue ASTERISK-14769) Review: https://reviewboard.asterisk.org/r/1286 Patch-by: Jamuel Starkey Tested-by: Kinsey Moore <kmoore@digium.com> git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331037 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-08app_queue: Add StateInterface to output of "queue show" and "QueueStatus"Kinsey Moore
This patch adds the state_interface of the queue member struct to the output of "queue show" (CLI command) and "QueueStatus" (AMI action) when displaying relevant queue member information. For the AMI event message the variable StateInterface has been added. (closes issue ASTERISK-18071) Review: https://reviewboard.asterisk.org/r/1300/ Patch-by: Jamuel Starkey git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331000 65c4cc65-6c06-0410-ace0-fbb531ad65f3