aboutsummaryrefslogtreecommitdiffstats
path: root/res
AgeCommit message (Collapse)AuthorFilesLines
2009-05-30Merged revisions 198375 via svnmerge from seanbright1-4/+14
https://origsvn.digium.com/svn/asterisk/trunk ........ r198375 | seanbright | 2009-05-30 16:11:33 -0400 (Sat, 30 May 2009) | 13 lines Properly terminate the receive buffer before sending to iksemel. aji_io_recv takes the maximum number of bytes to read (instead of the total buffer size), so we have to subtract 1 from our buffer size. Without this, when we receive packets that are larger than our buffer, iksemel will choke and things get wonky. (closes issue #15232) Reported by: lp0 Patches: 05302009_res_jabber.c.patch uploaded by seanbright (license 71) Tested by: seanbright, lp0 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@198390 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-30Merged revisions 198371 via svnmerge from seanbright1-8/+8
https://origsvn.digium.com/svn/asterisk/trunk ................ r198371 | seanbright | 2009-05-30 15:38:58 -0400 (Sat, 30 May 2009) | 19 lines Merged revisions 198370 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r198370 | seanbright | 2009-05-30 15:36:20 -0400 (Sat, 30 May 2009) | 12 lines Properly terminate AMI JabberSend response messages. The response message (either Error or Success) needs an extra trailing \r\n after the fields to inform the client that the message is complete. (closes issue #14876) Reported by: srt Patches: 05302009_1.4_res_jabber.c.diff uploaded by seanbright (license 71) asterisk_14876.patch uploaded by srt (license 378) trunk-14876-2.diff uploaded by phsultan (license 73) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@198373 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-30Merged revisions 198312 via svnmerge from russell1-0/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r198312 | russell | 2009-05-29 22:43:23 -0500 (Fri, 29 May 2009) | 12 lines Merged revisions 198311 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r198311 | russell | 2009-05-29 22:42:46 -0500 (Fri, 29 May 2009) | 5 lines Fix a crash that occurred when MWI SMDI messages expired. (closes issue #14561) Reported by: cmoss28 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@198314 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-29Merged revisions 198183 via svnmerge from russell1-1/+13
https://origsvn.digium.com/svn/asterisk/trunk ........ r198183 | russell | 2009-05-29 17:33:31 -0500 (Fri, 29 May 2009) | 2 lines Improve handling of trying to ACK too many timer expirations. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@198184 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-29Merged revisions 198146 via svnmerge from russell1-62/+62
https://origsvn.digium.com/svn/asterisk/trunk ........ r198146 | russell | 2009-05-29 15:06:59 -0500 (Fri, 29 May 2009) | 38 lines Resolve issues with choppy sound when using res_timing_pthread. The situation that caused this problem was when continuous mode was being turned on and off while a rate was set for a timing interface. A very easy way to replicate this bug was to do a Playback() from behind a Local channel. In this scenario, a rate gets set on the channel for doing file playback. At the same time, continuous mode gets turned on and off about every 20 ms as frames get queued on to the PBX side channel from the other side of the Local channel. Essentially, this module treated continuous mode and a set rate as mutually exclusive states for the timer to be in. When I dug deep enough, I observed the following pattern: 1) Set timer to tick every 20 ms. 2) Wait almost 20 ms ... 3) Continuous mode gets turned on for a queued up frame 4) Continuous mode gets turned off 5) The timer goes back to its tick per 20 ms. state but starts counting at 0 ms. 6) Goto step 2. Sometimes, res_timing_pthread would make it 20 ms and produce a timer tick, but not most of the time. This is what produced the choppy sound (or sometimes no sound at all). Now, the module treats continuous mode and a set rate as completely independent timer modes. They can be enabled and disabled independently of each other and things work as expected. (closes issue #14412) Reported by: dome Patches: issue14412.diff.txt uploaded by russell (license 2) issue14412-1.6.1.0.diff.txt uploaded by russell (license 2) Tested by: DennisD, russell ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@198147 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-29Merged revisions 197960 via svnmerge from russell1-11/+11
https://origsvn.digium.com/svn/asterisk/trunk ........ r197960 | russell | 2009-05-29 11:15:30 -0500 (Fri, 29 May 2009) | 2 lines Trim trailing whitespace so that I can work on this bug without it bothering me. :-) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@197969 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-26Merged revisions 196843 via svnmerge from russell1-0/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r196843 | russell | 2009-05-26 13:20:57 -0500 (Tue, 26 May 2009) | 16 lines Merged revisions 196826 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r196826 | russell | 2009-05-26 13:14:36 -0500 (Tue, 26 May 2009) | 9 lines Resolve a file handle leak. The frames here should have always been freed. However, out of luck, there was never any memory leaked. However, after file streams became reference counted, this code would leak the file stream for the file being read. (closes issue #15181) Reported by: jkroon ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@196869 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-18Recorded merge of revisions 195370 via svnmerge from tilghman1-0/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r195370 | tilghman | 2009-05-18 15:52:33 -0500 (Mon, 18 May 2009) | 15 lines Recorded merge of revisions 195366 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r195366 | tilghman | 2009-05-18 15:24:13 -0500 (Mon, 18 May 2009) | 8 lines Add a similar dependency on SMDI for voicemail as already exists for ADSI. (closes issue #14846) Reported by: pj Patches: 20090413__bug14846__1.4.diff.txt uploaded by tilghman (license 14) 20090507__issue14846__1.6.0.diff.txt uploaded by tilghman (license 14) 20090507__issue14846__1.6.1.diff.txt uploaded by tilghman (license 14) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@195372 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-04Recorded merge of revisions 192171 via svnmerge from tilghman1-0/+11
https://origsvn.digium.com/svn/asterisk/trunk ........ r192171 | tilghman | 2009-05-04 14:29:13 -0500 (Mon, 04 May 2009) | 8 lines Restore 'asyncagi break' command to 1.6.1 and higher. (closes issue #14985) Reported by: nikkk Patches: 20090428__bug14985.diff.txt uploaded by tilghman (license 14) 20090429__bug14985__1.6.1.diff.txt uploaded by tilghman (license 14) Tested by: nikkk ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@192172 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-27Merged revisions 190663 via svnmerge from russell1-2/+26
https://origsvn.digium.com/svn/asterisk/trunk ................ r190663 | russell | 2009-04-27 14:08:12 -0500 (Mon, 27 Apr 2009) | 22 lines Merged revisions 190661-190662 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r190661 | russell | 2009-04-27 14:00:54 -0500 (Mon, 27 Apr 2009) | 9 lines Resolve a crash in res_smdi when used with chan_dahdi. When chan_dahdi goes to get an SMDI message, it provides no search criteria. It just grabs the next message that arrives. This code was written with the SMDI dialplan functions in mind, since that is now the preferred method of using SMDI. However, this broke support of it being used from chan_dahdi. (closes AST-212) ........ r190662 | russell | 2009-04-27 14:03:59 -0500 (Mon, 27 Apr 2009) | 2 lines Fix a typo from 190661. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@190665 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-20Merged revisions 189464 via svnmerge from seanbright2-375/+397
https://origsvn.digium.com/svn/asterisk/trunk ................ r189464 | seanbright | 2009-04-20 17:09:59 -0400 (Mon, 20 Apr 2009) | 20 lines Merged revisions 189462 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r189462 | seanbright | 2009-04-20 16:58:39 -0400 (Mon, 20 Apr 2009) | 13 lines Properly handle @s within hints in AEL. AEL was not handling the case of a device hint containing an @ symbol, which caused parking hints (e.g. hint(park:exten@context)) to error out the parser. This patch makes AEL treat the @ the same way it treats colon and ampersand now, meaning the characters are included in verbatim. (closes issue #14941) Reported by: bpgoldsb Patches: bug14941.patch uploaded by seanbright (license 71) Tested by: bpgoldsb ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@189531 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-13Merged revisions 188102 via svnmerge from mmichelson1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r188102 | mmichelson | 2009-04-13 14:31:48 -0500 (Mon, 13 Apr 2009) | 5 lines Fix another crash related to cached realtime music on hold. This was another off-by-one problem caused by moh_register. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@188104 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-09Merged revisions 187421,187424 via svnmerge from mmichelson1-42/+51
https://origsvn.digium.com/svn/asterisk/trunk ........ r187421 | mmichelson | 2009-04-09 12:30:39 -0500 (Thu, 09 Apr 2009) | 21 lines Fix a crash in res_musiconhold when using cached realtime moh. The moh_register function links an mohclass and then immediately unrefs the class since the container now has a reference. The problem with using realtime music on hold is that the class is allocated, registered, and started in one fell swoop. The refcounting logic resulted in the count being off by one. The same problem did not happen when using a static config because the allocation and registration of an mohclass is a separate operation from starting moh. This also did not affect non-cached realtime moh because the classes are not registered at all. I also have modified res_musiconhold to use the _t_ variants of the ao2_ functions so that more info can be gleaned when attempting to trace the refcounts. I found this to be incredibly helpful for debugging this issue and there's no good reason to remove it. (closes issue #14661) Reported by: sum ........ r187424 | mmichelson | 2009-04-09 12:34:39 -0500 (Thu, 09 Apr 2009) | 3 lines Use safe macro practices even though they really aren't necessary. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@187427 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-08Merged revisions 187046 via svnmerge from mmichelson1-3/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r187046 | mmichelson | 2009-04-08 11:52:20 -0500 (Wed, 08 Apr 2009) | 16 lines Merged revisions 187045 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r187045 | mmichelson | 2009-04-08 11:52:03 -0500 (Wed, 08 Apr 2009) | 10 lines Fix a small logical error when loading moh classes. We were unconditionally incrementing the number of mohclasses registered. However, we should actually only increment if the call to moh_register was successful. While this probably has never caused problems, I noticed it and decided to fix it anyway. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@187048 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-27Merged revisions 184673 via svnmerge from file1-0/+7
https://origsvn.digium.com/svn/asterisk/trunk ........ r184673 | file | 2009-03-27 12:46:46 -0300 (Fri, 27 Mar 2009) | 7 lines Fix speech structure leak in the AGI speech recognition integration. The AGI dialplan applications did not destroy the speech structure automatically if it was not destroyed by the running AGI script. They will now do this. (issue LUMENVOX-15) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@184675 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-27Merged revisions 184630 via svnmerge from russell1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r184630 | russell | 2009-03-27 09:00:18 -0500 (Fri, 27 Mar 2009) | 2 lines Change g_eid to ast_eid_default. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@184631 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-25Merged revisions 184339 via svnmerge from russell1-32/+16
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.1@184342 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-23Merged revisions 183766 via svnmerge from mmichelson1-5/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r183766 | mmichelson | 2009-03-23 13:58:03 -0500 (Mon, 23 Mar 2009) | 13 lines Merged revisions 183700 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r183700 | mmichelson | 2009-03-23 12:59:28 -0500 (Mon, 23 Mar 2009) | 7 lines Fix a memory leak in res_monitor.c The only way that this leak would occur is if Monitor were started using the Manager interface and no File: header were given. Discovered while reviewing the ast_channel_ao2 review request. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@183768 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-18Merged revisions 182847 via svnmerge from russell1-1/+1
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.1@182946 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-12Merged revisions 181665 via svnmerge from file1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r181665 | file | 2009-03-12 13:56:58 -0300 (Thu, 12 Mar 2009) | 9 lines Merged revisions 181664 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r181664 | file | 2009-03-12 13:56:20 -0300 (Thu, 12 Mar 2009) | 2 lines Fix incorrect usage of strncasecmp... I really meant to use strcasecmp. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@181667 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-12Merged revisions 181661 via svnmerge from file1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r181661 | file | 2009-03-12 13:53:52 -0300 (Thu, 12 Mar 2009) | 19 lines Merged revisions 181659-181660 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r181659 | file | 2009-03-12 13:50:37 -0300 (Thu, 12 Mar 2009) | 8 lines Fix another scenario where depending on configuration the stream would not get read. For custom commands we don't know whether the audio is coming from a stream or not so we are going to have to read the data despite no channels. (closes issue #14416) Reported by: caspy ........ r181660 | file | 2009-03-12 13:52:45 -0300 (Thu, 12 Mar 2009) | 2 lines Fix logic flaw in previous commit. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@181663 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-12Merged revisions 181656 via svnmerge from file1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r181656 | file | 2009-03-12 13:32:20 -0300 (Thu, 12 Mar 2009) | 17 lines Merged revisions 181655 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r181655 | file | 2009-03-12 13:29:19 -0300 (Thu, 12 Mar 2009) | 10 lines Fix issue with streaming MOH failing if nobody is listening. When a music class is setup to actually provide music on hold from a stream we need to constantly read audio from it since it will constantly be providing audio. This is now done despite there being no channels listening to it. (closes issue #14416) Reported by: caspy ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@181658 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-03Merged revisions 179937 via svnmerge from mmichelson1-3/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r179937 | mmichelson | 2009-03-03 14:59:16 -0600 (Tue, 03 Mar 2009) | 20 lines Add documentation for timing modules used in Asterisk This document specifies the timing modules available in Asterisk beginning with Asterisk 1.6.1. The document goes into detail about the differences between each and gives a general overview of what timing is used for in Asterisk. There is also a section which can be used to help customize your setup or to troubleshoot timing issues you may have. I also added messages to the DAHDI timing test used in res_timing_dahdi.c that points to this new documentation if people experience problems. Big thanks to all who contributed comments on this. (closes issue #14490) Reported by: mmichelson Patches: timing.txt uploaded by mmichelson (license 60) Review: http://reviewboard.digium.com/r/164/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@179939 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-27Merged revisions 179164 via svnmerge from russell1-0/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r179164 | russell | 2009-02-27 15:47:18 -0600 (Fri, 27 Feb 2009) | 2 lines Mark res_ais as experimental, as the binary event format is subject to change. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@179166 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-19Merged revisions 177286 via svnmerge from murf2-228/+238
https://origsvn.digium.com/svn/asterisk/trunk ................ r177286 | murf | 2009-02-18 16:50:57 -0700 (Wed, 18 Feb 2009) | 39 lines Merged revisions 177225 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r177225 | murf | 2009-02-18 15:43:14 -0700 (Wed, 18 Feb 2009) | 34 lines This patch fixes a regression of sorts that was introduced in rev 24425. It basically fixes AST-190/ABE-1782. What was wrong: the user has 6000 extensions in one context; and then 6000 contexts, one per extension. The parser could only handle about 4893 of the 6000 extens in the single context. This was due to the regression I mentioned. To get rid of shift/reduce conflicts, Luigi set up right-recursive lists for globals, context elements, switch lists, and statements. Right recursive lists got rid of the warnings, but instead, they use up a tremendous amount of stack space when the lists are long. I saw this a few years back, and resolved not to fix it until someone complained. That day has arrived! After the changes were made, I ran the regression test suite, and there were no problems. I took the test case the user provided, and added 100,000 extensions to the single context, that already had 6,000 extens in it. (I'll see your 6, and raise you 100!) It takes a few minutes to read it all in, check it and generate code for it, but no problems. So, I think I can say that fundamentally, there are no longer any limits on the number of items you can place in contexts, statement blocks, switches, or globals, beyond your virt mem constraints. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@177294 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-17Merged revisions 176666 via svnmerge from russell2-21/+25
https://origsvn.digium.com/svn/asterisk/trunk ........ r176666 | russell | 2009-02-17 15:22:40 -0600 (Tue, 17 Feb 2009) | 16 lines Update the timing API to have better support for multiple timing interfaces. 1) Add module use count handling so that timing modules can be unloaded. 2) Implement unload_module() functions for the timing interface modules. 3) Allow multiple timing modules to be loaded, and use the one with the highest priority value. 4) Report which timing module is being use in the "timing test" CLI command. (closes issue #14489) Reported by: russell Review: http://reviewboard.digium.com/r/162/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@176675 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-17Merged revisions 176592,176642 via svnmerge from tilghman1-7/+26
https://origsvn.digium.com/svn/asterisk/trunk ........ r176592 | tilghman | 2009-02-17 12:49:20 -0600 (Tue, 17 Feb 2009) | 4 lines Add assertions in the quest to track down a refcount leak. (closes issue #14485) Reported by: davevg ........ r176642 | tilghman | 2009-02-17 15:14:18 -0600 (Tue, 17 Feb 2009) | 8 lines Prior to masquerade, move the group definitions to the channel performing the masq, so that the group count lingers past the bridge. (closes issue #14275) Reported by: kowalma Patches: 20090216__bug14275.diff.txt uploaded by Corydon76 (license 14) Tested by: kowalma ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@176644 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-09Merged revisions 174219 via svnmerge from file1-9/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r174219 | file | 2009-02-09 10:49:24 -0400 (Mon, 09 Feb 2009) | 11 lines Merged revisions 174218 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r174218 | file | 2009-02-09 10:48:21 -0400 (Mon, 09 Feb 2009) | 4 lines Don't overwrite our pointer to the music class when music on hold stops. We will use this if it starts again to see if we can resume the music where it left off. (closes issue #14407) Reported by: mostyn ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@174221 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-07Merged revisions 174149 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r174149 | russell | 2009-02-07 10:16:50 -0600 (Sat, 07 Feb 2009) | 10 lines Merged revisions 174148 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r174148 | russell | 2009-02-07 10:15:07 -0600 (Sat, 07 Feb 2009) | 2 lines Fix a race condition that could cause a crash. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@174154 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-05Oops, merge from trunk broke 1.6.1tilghman1-1/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@173778 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-05Merged revisions 173657 via svnmerge from tilghman1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r173657 | tilghman | 2009-02-05 13:36:29 -0600 (Thu, 05 Feb 2009) | 2 lines Change the first field, or we don't get the necessary field separation. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@173658 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-28Merged revisions 172131 via svnmerge from tilghman1-5/+9
https://origsvn.digium.com/svn/asterisk/trunk ........ r172131 | tilghman | 2009-01-28 16:48:01 -0600 (Wed, 28 Jan 2009) | 7 lines Fix how we skip fields (to avoid fields which don't exist) when doing an UPDATE. (closes issue #14205) Reported by: maxgo Patches: 20090128__bug14205__5.diff.txt uploaded by Corydon76 (license 14) Tested by: blitzrage ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@172133 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-16Merged revisions 168746 via svnmerge from murf1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r168746 | murf | 2009-01-15 17:34:31 -0700 (Thu, 15 Jan 2009) | 20 lines Merged revisions 168745 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r168745 | murf | 2009-01-15 17:19:12 -0700 (Thu, 15 Jan 2009) | 14 lines This patch fixes a problem where a goto (or jump, in this case) fails a consistency check because it can't find a matching extension. The problem was a missing instruction to end the range notation in the code where it converts the pattern into a regex and uses the regex code to determine the match. I tested using the AEL code the user supplied, and now, the consistency check passes. (closes issue #14141) Reported by: dimas ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168748 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-13Merged revisions 168588 via svnmerge from twilson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r168588 | twilson | 2009-01-13 17:05:43 -0600 (Tue, 13 Jan 2009) | 5 lines Fully overwrite a same-named file when uploading (closes issue #14190) Reported by: timking ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168590 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-13Merged revisions 168562 via svnmerge from russell2-12/+12
https://origsvn.digium.com/svn/asterisk/trunk ................ r168562 | russell | 2009-01-13 13:22:13 -0600 (Tue, 13 Jan 2009) | 10 lines Merged revisions 168561 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r168561 | russell | 2009-01-13 13:13:05 -0600 (Tue, 13 Jan 2009) | 2 lines Revert unnecessary indications API change from rev 122314 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168565 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-12Merged revisions 168517 via svnmerge from jpeeler1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r168517 | jpeeler | 2009-01-12 15:51:46 -0600 (Mon, 12 Jan 2009) | 12 lines Merged revisions 168516 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r168516 | jpeeler | 2009-01-12 15:42:34 -0600 (Mon, 12 Jan 2009) | 5 lines (closes issue #13881) Reported by: hoowa Update the app CDR field for AGI commands that are not executing an application via "exec". ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168519 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-09Merged revisions 168200 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r168200 | russell | 2009-01-09 16:21:05 -0600 (Fri, 09 Jan 2009) | 10 lines Merged revisions 168198 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r168198 | russell | 2009-01-09 16:14:38 -0600 (Fri, 09 Jan 2009) | 2 lines Make this compile for mvanbaak ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168209 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-09Merged revisions 168142 via svnmerge from twilson1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r168142 | twilson | 2009-01-09 14:25:25 -0600 (Fri, 09 Jan 2009) | 7 lines Don't leak memory if phoneprov.conf does not exist (closes issue #14203) Reported by: jamesgolovich Patches: asterisk-phoneprovleak.diff.txt uploaded by jamesgolovich (license 176) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168157 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-09Merged revisions 168090 via svnmerge from tilghman1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r168090 | tilghman | 2009-01-09 12:30:55 -0600 (Fri, 09 Jan 2009) | 3 lines When using ast_str with a non-ast_str-enabled API, we need to update the buffer or otherwise, we cannot use ast_str_strlen(). ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168092 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-08Merged revisions 167894 via svnmerge from tilghman1-3/+19
https://origsvn.digium.com/svn/asterisk/trunk ................ r167894 | tilghman | 2009-01-08 16:37:20 -0600 (Thu, 08 Jan 2009) | 13 lines Merged revisions 167840 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r167840 | tilghman | 2009-01-08 16:08:56 -0600 (Thu, 08 Jan 2009) | 6 lines Don't truncate database results at 255 chars. (closes issue #14069) Reported by: evandro Patches: 20081214__bug14069.diff.txt uploaded by Corydon76 (license 14) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@167905 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-30Merged revisions 166908 via svnmerge from twilson2-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r166908 | twilson | 2008-12-30 14:50:05 -0600 (Tue, 30 Dec 2008) | 2 lines Fix some svn:keywords ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@166910 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-22Merged revisions 166470 via svnmerge from mmichelson1-8/+16
https://origsvn.digium.com/svn/asterisk/trunk ........ r166470 | mmichelson | 2008-12-22 17:25:34 -0600 (Mon, 22 Dec 2008) | 11 lines Always use the value of the AGISIGHUP when running an AGI. Prior to this patch, the value of AGISIGUP was not always honored when set on a channel. (closes issue #13711) Reported by: fmueller Patches: 13711.patch uploaded by putnopvut (license 60) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@166472 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-22Merged revisions 166436 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r166436 | russell | 2008-12-22 15:45:28 -0600 (Mon, 22 Dec 2008) | 2 lines Cosmetic change - don't mix struct initializer styles. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@166438 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-22Merged revisions 166377 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r166377 | russell | 2008-12-22 14:26:48 -0600 (Mon, 22 Dec 2008) | 2 lines Fix a bad typo. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@166379 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-22Merged revisions 166273 via svnmerge from russell1-371/+419
https://origsvn.digium.com/svn/asterisk/trunk ........ r166273 | russell | 2008-12-22 10:10:40 -0600 (Mon, 22 Dec 2008) | 7 lines Re-work ref count handling of MoH classes using astobj2 to resolve crashes. (closes issue #13566) Reported by: igorcarneiro Tested by: russell Review: http://reviewboard.digium.com/r/106/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@166277 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-22Merged revisions 166258 via svnmerge from russell1-19/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r166258 | russell | 2008-12-22 08:16:54 -0600 (Mon, 22 Dec 2008) | 26 lines Remove AST_PBX_KEEPALIVE usage from res_agi. This patch removes the usage of AST_PBX_KEEPALIVE from res_agi. The only usage was for the AGI command, "asyncagi break". This patch removes this feature. Normally, a feature would not be removed like this. However, this code is broken and usage of it will result in a memory leak. Usage of this feature will make the AGI code return a result of AST_PBX_KEEPALIVE. The PBX handler assumes that another thread has assumed ownership of the channel. The channel thread will exit without destroying the channel. Unfortunately, _no_ thread has ownership of the channel at this point. There are a couple of serious problems here: 1) The only way to recover the caller is to issue a channel redirect. This will work, but this will be done with a masquerade, and the old ast_channel structure will be lost. 2) Until the channel redirect happens, there is no code servicing the channel. That means nothing is reading audio or handling events coming from the channel. This is very bad. The recommended way to get this same "break" functionality is to issue the redirect while the channel is still being handled by the AGI code. That way, there will be no memory leak, and there will be no period of time that the channel is not being serviced. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@166260 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-18Merged revisions 165724 via svnmerge from mmichelson1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r165724 | mmichelson | 2008-12-18 13:34:33 -0600 (Thu, 18 Dec 2008) | 8 lines Fix crashes in res_odbc. The variable "class" was being set NULL just prior to being dereferenced in an ao2_link call. I have moved the setting of the variable to NULL until after the ao2_link call. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@165725 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-18Merged revisions 165662 via svnmerge from russell1-6/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r165662 | russell | 2008-12-18 12:54:47 -0600 (Thu, 18 Dec 2008) | 15 lines Merged revisions 165661 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r165661 | russell | 2008-12-18 12:52:18 -0600 (Thu, 18 Dec 2008) | 7 lines Set the process group ID on the MOH process so that all children will get killed (closes issue #14099) Reported by: caspy Patches: res_musiconhold.c.patch.killpg.try2 uploaded by caspy (license 645) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@165664 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-18Merged revisions 165541 via svnmerge from tilghman1-3/+12
https://origsvn.digium.com/svn/asterisk/trunk ........ r165541 | tilghman | 2008-12-18 10:36:48 -0600 (Thu, 18 Dec 2008) | 2 lines Fix reference counts of the class and add an assertion to the end. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@165543 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-17Merged revisions 165330 via svnmerge from mmichelson1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r165330 | mmichelson | 2008-12-17 15:46:19 -0600 (Wed, 17 Dec 2008) | 3 lines Fix a refcount leak in res_odbc ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@165332 f38db490-d61c-443f-a65b-d21fe96a405b