aboutsummaryrefslogtreecommitdiffstats
path: root/apps
AgeCommit message (Collapse)AuthorFilesLines
2009-05-05Merged revisions 192430 via svnmerge from file1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r192430 | file | 2009-05-05 14:46:51 -0300 (Tue, 05 May 2009) | 12 lines Merged revisions 192429 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r192429 | file | 2009-05-05 14:43:30 -0300 (Tue, 05 May 2009) | 5 lines Fix a bug where the followme application would continue trying numbers after the caller hung up. (closes issue #13624) Reported by: sgenyuk ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@192433 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-04Merged revisions 192096 via svnmerge from lmadsen1-2/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r192096 | lmadsen | 2009-05-04 13:42:56 -0400 (Mon, 04 May 2009) | 4 lines Commit documentation changes related to issue #14801. (issue #14801) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@192097 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-29Merged revisions 190830 via svnmerge from transnexus1-242/+243
https://origsvn.digium.com/svn/asterisk/trunk ........ r190830 | transnexus | 2009-04-28 17:10:42 +0800 (Tue, 28 Apr 2009) | 2 lines Updated for OSP Toolkit 3.5. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@190985 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-27Merged revisions 190622 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r190622 | mmichelson | 2009-04-27 11:26:14 -0500 (Mon, 27 Apr 2009) | 3 lines Update warning message to not have pipes and contain all options. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@190625 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-23Merged revisions 190250 via svnmerge from mmichelson1-5/+7
https://origsvn.digium.com/svn/asterisk/trunk ........ r190250 | mmichelson | 2009-04-23 12:45:35 -0500 (Thu, 23 Apr 2009) | 9 lines Fix reversed behavior of leavewhenempty option in queues.conf. (closes issue #14650) Reported by: alecdavis Patches: 14650.patch uploaded by mmichelson (license 60) Tested by: mmichelson, lmadsen ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@190253 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-20Merged revisions 189495,189516 via svnmerge from twilson1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r189495 | twilson | 2009-04-20 16:24:34 -0500 (Mon, 20 Apr 2009) | 9 lines Merged revisions 189463 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r189463 | twilson | 2009-04-20 16:00:52 -0500 (Mon, 20 Apr 2009) | 2 lines Don't treat a NOANSWER like a CHANUNAVAIL ........ ................ r189516 | twilson | 2009-04-20 16:29:29 -0500 (Mon, 20 Apr 2009) | 9 lines Merged revisions 189465 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r189465 | twilson | 2009-04-20 16:10:27 -0500 (Mon, 20 Apr 2009) | 2 lines Update CDR appropriately when AST_CAUSE_NO_ANSWER is set ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@189536 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-16Merged revisions 188774 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r188774 | tilghman | 2009-04-16 16:03:31 -0500 (Thu, 16 Apr 2009) | 11 lines Merged revisions 188773 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r188773 | tilghman | 2009-04-16 16:02:29 -0500 (Thu, 16 Apr 2009) | 4 lines Umask should not be exported into global namespace. (closes issue #14912) Reported by: jcapp ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@188777 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-14Merged revisions 188470 via svnmerge from mmichelson1-1/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r188470 | mmichelson | 2009-04-14 18:28:13 -0500 (Tue, 14 Apr 2009) | 3 lines Fix a couple of queue member reference leaks. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@188474 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-13Merged revisions 188032 via svnmerge from mmichelson1-0/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r188032 | mmichelson | 2009-04-13 09:17:56 -0500 (Mon, 13 Apr 2009) | 6 lines Set all queue variables on both the caller and member channels. This allows for the variables to be accessed if a member macro is run. Thanks to Grigoriy Puzankin for bringing this up on the -dev list. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@188039 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-09Merged revisions 187363 via svnmerge from tilghman1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r187363 | tilghman | 2009-04-09 11:39:43 -0500 (Thu, 09 Apr 2009) | 10 lines Merged revisions 187362 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r187362 | tilghman | 2009-04-09 11:38:37 -0500 (Thu, 09 Apr 2009) | 3 lines Permit zero-length text messages in SIP. (Related to an issue posted to the -users list, subject "AEL2, BASE64_DECODE and hexadecimal") ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@187366 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-07Merged revisions 186799 via svnmerge from tilghman1-4/+0
https://origsvn.digium.com/svn/asterisk/trunk ................ r186799 | tilghman | 2009-04-07 17:23:46 -0500 (Tue, 07 Apr 2009) | 10 lines Merged revisions 186775 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r186775 | tilghman | 2009-04-07 17:16:50 -0500 (Tue, 07 Apr 2009) | 3 lines Fix Macro documentation to match current (and intended) behavior. (See -dev mailing list) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@186807 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-03Merged revisions 186444,186447 via svnmerge from tilghman1-24/+102
https://origsvn.digium.com/svn/asterisk/trunk ................ r186444 | tilghman | 2009-04-03 14:30:34 -0500 (Fri, 03 Apr 2009) | 14 lines Merged revisions 186415 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r186415 | tilghman | 2009-04-03 14:06:58 -0500 (Fri, 03 Apr 2009) | 7 lines Distinguish in a sent email between simple sends and forwards. (closes issue #11678) Reported by: jamessan Patches: 20090330__bug11678.diff.txt uploaded by tilghman (license 14) Tested by: tilghman, lmadsen ........ ................ r186447 | tilghman | 2009-04-03 14:59:55 -0500 (Fri, 03 Apr 2009) | 9 lines Merged revisions 186445 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r186445 | tilghman | 2009-04-03 14:56:48 -0500 (Fri, 03 Apr 2009) | 2 lines Found a conflict in the last commit, due to multiple targets ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@186449 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-03Merged revisions 186286 via svnmerge from mmichelson1-16/+8
https://origsvn.digium.com/svn/asterisk/trunk ........ r186286 | mmichelson | 2009-04-03 09:32:05 -0500 (Fri, 03 Apr 2009) | 20 lines Fix the ability to retrieve voicemail messages from IMAP. A recent change made interactive vm_states no longer get added to the list of vm_states and instead get stored in thread-local storage. In trunk and all the 1.6.X branches, the problem is that when we search for messages in a voicemail box, we would attempt to update the appropriate vm_state struct by directly searching in the list of vm_states instead of using the get_vm_state_by_imap_user function. This meant we could not find the interactive vm_state that we wanted. (closes issue #14685) Reported by: BlargMaN Patches: 14685.patch uploaded by mmichelson (license 60) Tested by: BlargMaN, qualleyiv, mmichelson ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@186289 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-31Merged revisions 185604 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r185604 | mmichelson | 2009-03-31 17:12:52 -0500 (Tue, 31 Mar 2009) | 3 lines Fix trunk's compilation. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@185605 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-31Merged revisions 185600 via svnmerge from mmichelson1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r185600 | mmichelson | 2009-03-31 17:02:48 -0500 (Tue, 31 Mar 2009) | 12 lines Merged revisions 185599 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r185599 | mmichelson | 2009-03-31 17:00:01 -0500 (Tue, 31 Mar 2009) | 6 lines Fix crash that would occur if an empty member was specified in queues.conf. (closes issue #14796) Reported by: pida ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@185603 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-31Merged revisions 185469 via svnmerge from mmichelson1-6/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r185469 | mmichelson | 2009-03-31 14:46:18 -0500 (Tue, 31 Mar 2009) | 14 lines Merged revisions 185468 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r185468 | mmichelson | 2009-03-31 14:45:30 -0500 (Tue, 31 Mar 2009) | 8 lines Fix Russian voicemail intro to say the word "messages" properly. (closes issue #14736) Reported by: chappell Patches: voicemail_no_messages.diff uploaded by chappell (license 8) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@185472 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-31Merged revisions 185261 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r185261 | russell | 2009-03-31 09:53:45 -0500 (Tue, 31 Mar 2009) | 5 lines Don't free() an astobj2 object. (closes issue #14672) Reported by: makoto ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@185264 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-30Merged revisions 185072 via svnmerge from mmichelson1-70/+81
https://origsvn.digium.com/svn/asterisk/trunk ................ r185072 | mmichelson | 2009-03-30 11:26:48 -0500 (Mon, 30 Mar 2009) | 45 lines Merged revisions 185031 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r185031 | mmichelson | 2009-03-30 11:17:35 -0500 (Mon, 30 Mar 2009) | 39 lines Fix queue weight behavior so that calls in low-weight queues are not inappropriately blocked. (This is copied and pasted from the review request I made for this patch) Asterisk has some odd behavior when queue weights are used. The current logic used when potentially calling a queue member is: If the member we are going to call is part of another queue and _that other queue has any callers in it_ and has a higher weight than the queue we are calling from, then don't try to contact that member. The issue here is what I have marked with underscores. If the higher-weighted queue has any callers in it at all, then the queue member will be unreachable from the lower-weighted queue. This has the potential to be really really bad if using a queue strategy, such as leastrecent or fewestcalls, with the potential to call the same member repeatedly. The fix proposed by garychen on issue 13220 is very simple and, as far as I can see, works well for this situation. With this set of changes, the logic used becomes: If the member we are going to call is part of another queue, the other queue has a higher weight than the queue we are calling from, and the higher weight queue has at least as many callers as available members, then do not try to contact the queue member. If the higher weighted queue has fewer callers than available members, then there is no reason to deny the call to this member since the other queue can afford to spare a member. Since the fix involved writing a generic function for determining the number of available members in the queue, I also modified the is_our_turn function to make use of the new num_available_members function to determine if it is our turn to try calling a member. There is one small behavior change. Before writing this patch, if you had autofill disabled, then if you were the head caller in a queue, you would automatically be told that it was your turn to try calling a member. This did not take into account whether there were actually any queue members available to take the call. Now we actually make sure there is at least one member available to take the call if autofill is disabled. (closes issue #13220) Reported by: garychen Review: http://reviewboard.digium.com/r/202/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@185089 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-29Merged revisions 184843 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r184843 | russell | 2009-03-29 00:52:20 -0500 (Sun, 29 Mar 2009) | 13 lines Merged revisions 184842 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r184842 | russell | 2009-03-29 00:51:55 -0500 (Sun, 29 Mar 2009) | 5 lines Ensure targs variable is fully initialized. (closes issue #14758) Reported by: tim_ringenbach ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@184846 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-27Merged revisions 184726 via svnmerge from russell1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r184726 | russell | 2009-03-27 13:04:43 -0500 (Fri, 27 Mar 2009) | 2 lines Use ast_random() instead of rand() to ensure we use the best RNG available. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@184729 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-27Merged revisions 184693 via svnmerge from russell3-3/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r184693 | russell | 2009-03-27 11:21:10 -0500 (Fri, 27 Mar 2009) | 2 lines Change global_app_buf to ast_str_thread_global_buf. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@184707 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-25Merged revisions 184339 via svnmerge from russell2-9/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r184339 | russell | 2009-03-25 16:57:19 -0500 (Wed, 25 Mar 2009) | 35 lines Improve performance of the ast_event cache functionality. This code comes from svn/asterisk/team/russell/event_performance/. Here is a summary of the changes that have been made, in order of both invasiveness and performance impact, from smallest to largest. 1) Asterisk 1.6.1 introduces some additional logic to be able to handle distributed device state. This functionality comes at a cost. One relatively minor change in this patch is that the extra processing required for distributed device state is now completely bypassed if it's not needed. 2) One of the things that I noticed when profiling this code was that a _lot_ of time was spent doing string comparisons. I changed the way strings are represented in an event to include a hash value at the front. So, before doing a string comparison, we do an integer comparison on the hash. 3) Finally, the code that handles the event cache has been re-written. I tried to do this in a such a way that it had minimal impact on the API. I did have to change one API call, though - ast_event_queue_and_cache(). However, the way it works now is nicer, IMO. Each type of event that can be cached (MWI, device state) has its own hash table and rules for hashing and comparing objects. This by far made the biggest impact on performance. For additional details regarding this code and how it was tested, please see the review request. (closes issue #14738) Reported by: russell Review: http://reviewboard.digium.com/r/205/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@184343 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-24Merged revisions 184079 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r184079 | mmichelson | 2009-03-24 17:40:39 -0500 (Tue, 24 Mar 2009) | 15 lines Merged revisions 184078 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r184078 | mmichelson | 2009-03-24 17:34:45 -0500 (Tue, 24 Mar 2009) | 9 lines Change NULL pointer check to be ast_strlen_zero. The 'digit' variable is guaranteed to be non-NULL, so the if statement could never evaluate true. Changing to ast_strlen_zero makes the logic correct. This was found while reviewing ast_channel_ao2 code review. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@184082 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-19Merged revisions 183244 via svnmerge from mmichelson1-13/+14
https://origsvn.digium.com/svn/asterisk/trunk ........ r183244 | mmichelson | 2009-03-19 13:10:34 -0500 (Thu, 19 Mar 2009) | 16 lines Fix a memory leak associated with queues. For every attempt that app_queue made to place an outbound call to a queue member, we would allocate a queue_end_bridge structure. When the bridge for the call had completed, we would free the structure. Unfortunately not all call attempts actually end up bridged to a member, so we need to be more selective of when to allocate the structure. With this change, the allocation occurs in an area where we can guarantee that the call will be bridged. (closes issue #14680) Reported by: caspy Patches: 14680.patch uploaded by mmichelson (license 60) Tested by: caspy ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@183247 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-18Merged revisions 182847 via svnmerge from russell2-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r182847 | russell | 2009-03-17 21:28:55 -0500 (Tue, 17 Mar 2009) | 52 lines Merged revisions 182810 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r182810 | russell | 2009-03-17 21:09:13 -0500 (Tue, 17 Mar 2009) | 44 lines Fix cases where the internal poll() was not being used when it needed to be. We have seen a number of problems caused by poll() not working properly on Mac OSX. If you search around, you'll find a number of references to using select() instead of poll() to work around these issues. In Asterisk, we've had poll.c which implements poll() using select() internally. However, we were still getting reports of problems. vadim investigated a bit and realized that at least on his system, even though we were compiling in poll.o, the system poll() was still being used. So, the primary purpose of this patch is to ensure that we're using the internal poll() when we want it to be used. The changes are: 1) Remove logic for when internal poll should be used from the Makefile. Instead, put it in the configure script. The logic in the configure script is the same as it was in the Makefile. Ideally, we would have a functionality test for the problem, but that's not actually possible, since we would have to be able to run an application on the _target_ system to test poll() behavior. 2) Always include poll.o in the build, but it will be empty if AST_POLL_COMPAT is not defined. 3) Change uses of poll() throughout the source tree to ast_poll(). I feel that it is good practice to give the API call a new name when we are changing its behavior and not using the system version directly in all cases. So, normally, ast_poll() is just redefined to poll(). On systems where AST_POLL_COMPAT is defined, ast_poll() is redefined to ast_internal_poll(). 4) Change poll() in main/poll.c to be ast_internal_poll(). It's worth noting that any code that still uses poll() directly will work fine (if they worked fine before). So, for example, out of tree modules that are using poll() will not stop working or anything. However, for modules to work properly on Mac OSX, ast_poll() needs to be used. (closes issue #13404) Reported by: agalbraith Tested by: russell, vadim http://reviewboard.digium.com/r/198/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@182947 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-13Change faulty comparison used when announcing average hold minutes and secondsmmichelson1-2/+2
(closes issue #14227) Reported by: caspy git-svn-id: http://svn.digium.com/svn/asterisk/trunk@182121 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-12Run the macro on the queue member's channel when he answers, not the ↵mmichelson1-1/+1
caller's channel. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@181846 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-12Fix crash when sleep and retries argument was not given to RetryDial ↵file1-2/+4
application. (closes issue #14647) Reported by: sherpya git-svn-id: http://svn.digium.com/svn/asterisk/trunk@181612 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-11Fix segfault when dialing a typo'd queuemmichelson1-5/+7
If trying to dial a non-existent queue, there would be a segfault when attempting to access q->weight, even though q was NULL. This problem was introduced during the queue-reset merge and thus only affects trunk. (closes issue #14643) Reported by: alecdavis git-svn-id: http://svn.digium.com/svn/asterisk/trunk@181244 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-11Don't play the "you are about to be placed into the conference" and "the ↵file1-10/+14
leader has left the conference" sounds if the quiet option is enabled. (reported by Vadim Lebedev on the asterisk-dev list) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@181210 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-06Merged revisions 180567 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r180567 | mmichelson | 2009-03-06 12:23:09 -0600 (Fri, 06 Mar 2009) | 2 lines Make compilation succeed in dev-mode when IMAP storage is enabled. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@180579 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-05Merged revisions 180464 via svnmerge from mmichelson1-0/+2
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r180464 | mmichelson | 2009-03-05 17:26:11 -0600 (Thu, 05 Mar 2009) | 16 lines [IMAP] Fix message retrieval issues when identical mailbox names were defined in separate contexts. There was a fix put in a while back so that an X-Asterisk-VM-Context message header was added to stored IMAP voicemails. This would allow for us to differentiate if the same mailbox name was used in multiple contexts. The problem still left was that not all places where messages were retrieved actually attempted to use this header for information when retrieving messages. This commit fixes that so that MWI and message retrieval from VoiceMailMain work as expected. (closes issue #13853) Reported by: vicks1 Patches: 13853_v2.patch uploaded by mmichelson (license 60) Tested by: lmadsen ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@180465 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-05Merged revisions 180380 via svnmerge from mmichelson1-7/+14
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r180380 | mmichelson | 2009-03-05 12:58:48 -0600 (Thu, 05 Mar 2009) | 25 lines Fix broken mailbox parsing when searchcontexts option is enabled. When using the searchcontexts option in voicemail.conf, the code made the assumption that all mailbox names defined were unique across all contexts. However, the code did nothing to actually enforce this assumption, nor did it do anything to alert a user that he may have created an ambiguity in his voicemail.conf file by defining the same mailbox name in multiple contexts. With this change, we now will issue a nice long warning if searchcontexts is on and we encounter the same mailbox name in multiple contexts and ignore any duplicates after the first box. Whether searchcontexts is enabled or not, if we come across a duplicate mailbox in the same context, then we will issue a warning and ignore the duplicated mailbox. I have also added a small note to voicemail.conf.sample in the explanation for searchcontexts explaining that you cannot define the same mailbox in multiple contexts if you have enabled the option. (closes issue #14599) Reported by: lmadsen Patches: 14599.patch uploaded by mmichelson (license 60) (with slight modification) Tested by: lmadsen ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@180383 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-05Merge phase 1 support for the new bridging architecture.file1-0/+809
This commit brings in the bridging core, bridging technologies, and the ConfBridge application. For usage information on the ConfBridge application please see the output of "core show application ConfBridge" from the CLI. For API documentation please see the doxygen page describing the architecture and the documentation for each API call. Review: http://reviewboard.digium.com/r/93/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@180369 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-04Remove duplicate 'k' and 'K' Dial options.file1-2/+0
(closes issue #14601) Reported by: alecdavis Patches: app_dial.optionk.diff.txt uploaded by alecdavis (license 585) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@180120 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-03app_read does not break from prompt loop with user terminated empty stringdvossel1-3/+3
In app.c, ast_app_getdata is called to stream the prompts and receive DTMF input. If ast_app_getdata() receives an empty string caused by the user inputing the end of string character, in this case '#', it should break from the prompt loop and return to app_read, but instead it cycles through all the prompts. I've added a return value for this special case in ast_readstring() which uses an enum I've delcared in apps.h. This enum is now used as a return value for ast_app_getdata(). (closes issue #14279) Reported by: Marquis Patches: fix_app_read.patch uploaded by Marquis (license 32) read-ampersanmd.patch2 uploaded by dvossel (license 671) Tested by: Marquis, dvossel Review: http://reviewboard.digium.com/r/177/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@180032 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-03Merged revisions 180006 via svnmerge from mmichelson1-0/+4
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r180006 | mmichelson | 2009-03-03 16:48:18 -0600 (Tue, 03 Mar 2009) | 17 lines Clarify some documentation of queues.conf.sample It had always been possible to explicitly specify a "blank" value for a sound file in queues.conf and have no sound played back. The problem with this is that it would result in some ugly CLI warnings from file.c. This commit introduces a check when playing a file in app_queue to see if the name of the file is zero-length and return early if that is the case. Also, the ability to specify the blank sound files in queues.conf is now mentioned more clearly in queues.conf.sample (closes issue #14227) Reported by: caspy ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@180007 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-03app_meetme not setting filename and fileformat correctly for realtimedvossel1-3/+39
When app_meetme finds a realtime conference, it doesn't get the filename and fileformat correctly when 'r' is set. Now app_meetme first checks to see if fileformat and filename are declared in the db, if they're not it checks the .conf file, if its not declared there either it then uses defaults. (closes issue #14545) Reported by: dalbaech Patches: app_meetme-realtime5.patch uploaded by dvossel (license 671) Realtime_Conference_Record_workaround.txt uploaded by dalbaech (license 705) Tested by: dvossel, dalbaech Review: http://reviewboard.digium.com/r/180/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@179972 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-03fix a leaked channel lock (and future deadlock) when we try to pick up our ↵bmd1-1/+1
own channel git-svn-id: http://svn.digium.com/svn/asterisk/trunk@179903 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-02Merged revisions 179532 via svnmerge from russell1-2/+2
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r179532 | russell | 2009-03-02 17:34:13 -0600 (Mon, 02 Mar 2009) | 40 lines Move ast_waitfor() down to avoid the results of the API call becoming stale. This call to ast_waitfor() was being done way too soon in this section of code. Specifically, there was code in between the call to waitfor and the code that uses the result that puts the channel in autoservice. By putting the channel in autoservice, the previous results of ast_waitfor() become meaningless, as the autoservice thread will do it's own ast_waitfor() and ast_read() on the channel. So, when we came back out of autoservice and eventually hit the block of code that calls ast_read() on the channel, there may not actually be any input on the channel available. Even though the previous call to ast_waitfor() in app_meetme said there was input, the autoservice thread has since serviced the channel for some period of time. This bug manifested itself while dvossel was doing some testing of MeetMe in Asterisk trunk. He was using the timerfd timing module. When the code hit ast_read() erroneously, it determined that it must have been called because of input on the timer fd, as chan->fdno was set to AST_TIMING_FD, since that was the cause of the last legitimate call to ast_read() done by autoservice. In this test, an IAX2 channel was calling into the MeetMe conference. It was _much_ more likely to be seen with an IAX2 channel because of the way audio is handled. Every audio frame that comes in results in a call to ast_queue_frame(), which then uses ast_timer_enable_continuous() to notify the channel thread that a frame is waiting to be handled. So, the chances of ast_waitfor() indicating that a channel needs servicing due to a timer event on an IAX2 event is very high. Finally, it is interesting to note that if a different timing interface was being used, this bug would probably not be noticed. When ast_read() is called and erroneously thinks that there is a timer event to handle, it calls the ast_timer_ack() function. The pthread and dahdi timing modules handle the ack() function being called when there is no event by simply ignoring it. In the case of the timerfd module, it results in a read() on the timer fd that will block forever, as there is no data to read. This caused Asterisk to lock up very quickly. Thanks to dvossel and mmichelson for the fun debugging session. :-) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@179533 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-01Swap reversed timevals.mmichelson1-1/+1
This was pointed out by ScribbleJ in #asterisk-dev. Thanks very much, ScribbleJ! git-svn-id: http://svn.digium.com/svn/asterisk/trunk@179254 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-26These small fixes prevent compiler warnings with ubuntu 8.10's gcc-4.3.2, ↵murf2-4/+4
which tend to break my dev-mode build. Not a problem in 1.6.x. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@178870 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-23Permit emailsubject and emailbody to be set per mailbox.tilghman1-7/+26
(closes issue #14372) Reported by: fhackenberger Patches: voicemail_individual_subject_and_body_1.6.1 uploaded by fhackenberger (license 592) with additional fixes by Corydon76 (license 14) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@178107 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-20Make app_fax compatible with spandsp-0.0.6pre4dhubbard1-3/+9
Prior to spandsp-0.0.6pre4 the t30_stats_t structure used a pages_transferred integer to indicate the number of pages transferred (so far) during the fax session. The spandsp-0.0.6pre4 release removed the pages_transferred integer and replaced it with two different integers - pages_tx and pages_rx. This revision uses the new integers for spandsp-0.0.6pre4 while maintaining backwards compatibility for previous spandsp releases. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@177699 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-20Allow semicolons to be escaped, when passing arguments to the System command.tilghman1-1/+8
(closes issue #14231) Reported by: jcovert Patches: 20090113__bug14231__2.diff.txt uploaded by Corydon76 (license 14) corrected_20090113__bug14231__2.diff.txt uploaded by jcovert (license 551) Tested by: jcovert git-svn-id: http://svn.digium.com/svn/asterisk/trunk@177664 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-20Oops, merge broke trunktilghman1-3/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@177661 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-19Merged revisions 177536 via svnmerge from tilghman1-2/+39
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r177536 | tilghman | 2009-02-19 16:26:01 -0600 (Thu, 19 Feb 2009) | 7 lines Fix up potential crashes, by reducing the sharing between interactive and non-interactive threads. (closes issue #14253) Reported by: Skavin Patches: 20090219__bug14253.diff.txt uploaded by Corydon76 (license 14) Tested by: Skavin ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@177537 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-19Merged revisions 177383 via svnmerge from file1-0/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r177383 | file | 2009-02-19 12:37:25 -0400 (Thu, 19 Feb 2009) | 3 lines If we are able to create a speech structure unset the ERROR variable in case it was previously set. (issue #LUMENVOX-13) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@177384 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-18Re-add 'o' option to MeetMe, reverting rev 62297.russell1-6/+10
Enabling this option by default proved to be a bad idea, as the talker detection is not very reliable. So, make it optional again, and off by default. (issue #13801) Reported by: justdave git-svn-id: http://svn.digium.com/svn/asterisk/trunk@177101 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-17Remove a dependency that no longer exists.russell1-4/+0
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@176771 f38db490-d61c-443f-a65b-d21fe96a405b