aboutsummaryrefslogtreecommitdiffstats
path: root/res
AgeCommit message (Collapse)AuthorFilesLines
2009-08-10Changes for 1.6.0.12v1.6.0.12tilghman9-32/+32
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.0.12@211672 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.0@182945 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.0@181666 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.0@181662 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.0@181657 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.0@177289 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.0@174220 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.0@174151 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-29Merged revisions 172441 via svnmerge from tilghman2-5/+38
https://origsvn.digium.com/svn/asterisk/trunk ................ r172441 | tilghman | 2009-01-29 17:15:40 -0600 (Thu, 29 Jan 2009) | 16 lines Merged revisions 172438 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r172438 | tilghman | 2009-01-29 16:54:29 -0600 (Thu, 29 Jan 2009) | 9 lines Lose the CAP_NET_ADMIN at every fork, instead of at startup. Otherwise, if Asterisk runs as a non-root user and the administrator does a 'restart now', Asterisk loses the ability to set QOS on packets. (closes issue #14004) Reported by: nemo Patches: 20090105__bug14004.diff.txt uploaded by Corydon76 (license 14) Tested by: Corydon76 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@172503 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.0@168747 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-13Merged revisions 168562 via svnmerge from russell2-10/+10
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.0@168564 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.0@168518 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.0@168204 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.0@168152 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.0@168091 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.0@167904 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-30Merged revisions 166908 via svnmerge from twilson1-1/+1
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.0@166909 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.0@166471 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.0@166437 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.0@166378 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-22Merged revisions 166273 via svnmerge from russell1-368/+416
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.0@166276 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.0@166259 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.0@165663 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-17Merged revisions 165318 via svnmerge from mmichelson1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r165318 | mmichelson | 2008-12-17 15:17:20 -0600 (Wed, 17 Dec 2008) | 15 lines Merged revisions 165255 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r165255 | mmichelson | 2008-12-17 14:51:38 -0600 (Wed, 17 Dec 2008) | 7 lines Fix some memory leaks found while looking at how realtime configs are handled. Also cleaned up some coding guidelines violations in app_realtime.c, mostly related to spacing ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@165322 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-17Merged revisions 165219 via svnmerge from twilson1-1/+6
https://origsvn.digium.com/svn/asterisk/trunk ........ r165219 | twilson | 2008-12-17 13:55:10 -0600 (Wed, 17 Dec 2008) | 2 lines Polycom phones close the connection after reading a little bit of the firmware files, we should stop sending in that case. Also, make that case print out a debug statement instead of a scary WARNING. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@165233 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-16Merged revisions 164606 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r164606 | russell | 2008-12-16 08:31:02 -0600 (Tue, 16 Dec 2008) | 13 lines Merged revisions 164605 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r164605 | russell | 2008-12-16 08:28:10 -0600 (Tue, 16 Dec 2008) | 5 lines Don't try to change working directory if a directory was not configured. (closes issue #14089) Reported by: caspy ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@164609 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-12Merged revisions 163612 via svnmerge from mvanbaak1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r163612 | mvanbaak | 2008-12-12 18:22:47 +0100 (Fri, 12 Dec 2008) | 7 lines Document default Monitor file location. (closes issue #14065) Reported by: kshumard Patches: res_monitor.documentation.patch.txt uploaded by kshumard (license 92) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@163620 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-11Merged revisions 163089 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r163089 | tilghman | 2008-12-11 10:52:24 -0600 (Thu, 11 Dec 2008) | 13 lines Merged revisions 163088 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r163088 | tilghman | 2008-12-11 10:51:27 -0600 (Thu, 11 Dec 2008) | 6 lines Don't wait forever, if there's a specified recording timeout. (closes issue #13885) Reported by: bamby Patches: res_agi.c.patch uploaded by bamby (license 430) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@163090 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-10Merged revisions 162927 via svnmerge from jpeeler1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r162927 | jpeeler | 2008-12-10 16:53:34 -0600 (Wed, 10 Dec 2008) | 11 lines Merged revisions 162926 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r162926 | jpeeler | 2008-12-10 16:52:51 -0600 (Wed, 10 Dec 2008) | 3 lines Oops, inverted logic for a strcasecmp check. Pointed out by mmichelson, thanks! ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@162928 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-10Merged revisions 162891 via svnmerge from jpeeler1-5/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r162891 | jpeeler | 2008-12-10 16:11:46 -0600 (Wed, 10 Dec 2008) | 13 lines Merged revisions 162874 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r162874 | jpeeler | 2008-12-10 16:04:18 -0600 (Wed, 10 Dec 2008) | 5 lines (closes issue #13229) Reported by: clegall_proformatique Ensure that moh_generate does not return prematurely before local_ast_moh_stop is called. Also, the sleep in mp3_spawn now only occurs for http locations since it seems to have been added originally only for failing media streams. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@162894 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-10Merged revisions 162583 via svnmerge from mvanbaak1-0/+8
https://origsvn.digium.com/svn/asterisk/trunk ........ r162583 | mvanbaak | 2008-12-10 12:34:09 +0100 (Wed, 10 Dec 2008) | 5 lines Make res_snmp.so compile on OpenBSD. OpenBSD uses an old version of gcc which throws an error if you use a macro that's not #defined ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@162584 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-09Merged revisions 162271 via svnmerge from murf2-86/+108
https://origsvn.digium.com/svn/asterisk/trunk ................ r162271 | murf | 2008-12-09 13:40:31 -0700 (Tue, 09 Dec 2008) | 9 lines Merged revisions 162264 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r162264 | murf | 2008-12-09 13:20:54 -0700 (Tue, 09 Dec 2008) | 1 line In discussion with seanbright on #asterisk-dev, I have added a default rule, and an option to suppress the default rule from being generated in the flex output, for the sake of those OS's where they didn't tweak flex's ECHO macro, and the compiler doesn't like it. The regressions are OK with this. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@162272 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-09Merged revisions 162140 via svnmerge from murf2-77/+103
https://origsvn.digium.com/svn/asterisk/trunk ................ r162140 | murf | 2008-12-09 11:35:35 -0700 (Tue, 09 Dec 2008) | 9 lines Merged revisions 162136 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r162136 | murf | 2008-12-09 11:13:39 -0700 (Tue, 09 Dec 2008) | 1 line Previous fix used ast_malloc and ast_copy_string and messed up the standalone stuff. Fixed. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@162141 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-09Merged revisions 162079 via svnmerge from murf3-107/+80
https://origsvn.digium.com/svn/asterisk/trunk ................ r162079 | murf | 2008-12-09 10:18:03 -0700 (Tue, 09 Dec 2008) | 53 lines Merged revisions 162013 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r162013 | murf | 2008-12-09 09:31:55 -0700 (Tue, 09 Dec 2008) | 45 lines (closes issue #14019) Reported by: ckjohnsonme Patches: 14019.diff uploaded by murf (license 17) Tested by: ckjohnsonme, murf This crash was the result of a few small errors that would combine in 64-bit land to result in a crash. 32-bit land might have seen these combine to mysteriously drop the args to an application call, in certain circumstances. Also, in trying to find this bug, I spotted a situation in the flex input, where, in passing back a 'word' to the parser, it would allocate a buffer larger than necessary. I changed the usage in such situations, so that strdup was not used, but rather, an ast_malloc, followed by ast_copy_string. I removed a field from the pval struct, in u2, that was never getting used, and set in one spot in the code. I believe it was an artifact of a previous fix to make switch cases work invisibly with extens. And, for goto's I removed a '!' from before a strcmp, that has been there since the initial merging of AEL2, that might prevent the proper target of a goto from being found. This was pretty harmless on its own, as it would just louse up a consistency check for users. Many thanks to ckjohnsonme for providing a simplified and complete set of information about the bug, that helped considerably in finding and fixing the problem. Now, to get aelparse up and running again in trunk, and out of its "horribly broken" state, so I can run the regression suite! ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@162080 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-29Merged revisions 159818 via svnmerge from kpfleming1-46/+45
https://origsvn.digium.com/svn/asterisk/trunk ........ r159818 | kpfleming | 2008-11-29 11:57:39 -0600 (Sat, 29 Nov 2008) | 18 lines incorporates r159808 from branches/1.4: ------------------------------------------------------------------------ r159808 | kpfleming | 2008-11-29 10:58:29 -0600 (Sat, 29 Nov 2008) | 7 lines update dev-mode compiler flags to match the ones used by default on Ubuntu Intrepid, so all developers will see the same warnings and errors since this branch already had some printf format attributes, enable checking for them and tag functions that didn't have them format attributes in a consistent way ------------------------------------------------------------------------ in addition: move some format attributes from main/utils.c to the header files they belong in, and fix up references to the relevant functions based on new compiler warnings ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@159855 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-20Merged revisions 158188 via svnmerge from seanbright1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r158188 | seanbright | 2008-11-20 14:41:23 -0500 (Thu, 20 Nov 2008) | 10 lines Fix one case where the application argument was not converted from a pipe to a comma. This was causing problems with switch statements with empty expressions. (closes issue #13901) Reported by: smurfix Patches: 20081118_bug13901.diff uploaded by seanbright (license 71) Tested by: seanbright Reviewed by: murf ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@158190 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-20Merged revisions 157974 via svnmerge from kpfleming1-2/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r157974 | kpfleming | 2008-11-19 18:08:12 -0600 (Wed, 19 Nov 2008) | 13 lines Merged revisions 157859 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r157859 | kpfleming | 2008-11-19 15:34:47 -0600 (Wed, 19 Nov 2008) | 7 lines the gcc optimizer frequently finds broken code (use of uninitalized variables, unreachable code, etc.), which is good. however, developers usually compile with the optimizer turned off, because if they need to debug the resulting code, optimized code makes that process very difficult. this means that we get code changes committed that weren't adequately checked over for these sorts of problems. with this build system change, if (and only if) --enable-dev-mode was used and DONT_OPTIMIZE is turned on, when a source file is compiled it will actually be preprocessed (into a .i or .ii file), then compiled once with optimization (with the result sent to /dev/null) and again without optimization (but only if the first compile succeeded, of course). while making these changes, i did some cleanup work in Makefile.rules to move commonly-used combinations of flag variables into their own variables, to make the file easier to read and maintain ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@157976 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-19Merged revisions 157743 via svnmerge from kpfleming1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r157743 | kpfleming | 2008-11-19 07:45:48 -0600 (Wed, 19 Nov 2008) | 1 line correct small bug introduced during API conversion ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@157746 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-19Merged revisions 157706 via svnmerge from kpfleming1-126/+159
https://origsvn.digium.com/svn/asterisk/trunk ........ r157706 | kpfleming | 2008-11-19 06:42:19 -0600 (Wed, 19 Nov 2008) | 5 lines make some corrections to the ast_agi_register_multiple(), ast_agi_unregister_multiple() and ast_agi_fdprintf() API calls to be consistent with API guidelines also, move UPGRADE.txt to UPGRADE-1.6.txt and make the new UPGRADE.txt contain information about upgrading between Asterisk 1.6 releases ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@157738 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-11Merged revisions 155862 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r155862 | tilghman | 2008-11-10 15:12:28 -0600 (Mon, 10 Nov 2008) | 5 lines Make documentation of update method match documentation and update update2 method to match. Reported by: atis, via -dev mailing list. Fixed by: me ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@156004 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-06Merged revisions 155121 via svnmerge from kpfleming2-85/+87
https://origsvn.digium.com/svn/asterisk/trunk ........ r155121 | kpfleming | 2008-11-06 16:49:19 -0600 (Thu, 06 Nov 2008) | 3 lines don't blindly assume that Darwin and Cygwin need GLOB_ABORTED defined; only define it if it is not already defined ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@155123 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-03port gcc 4.3.x warning fixes from trunk to this branchkpfleming9-211/+394
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@153743 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-10Merged revisions 148200 via svnmerge from seanbright1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r148200 | seanbright | 2008-10-09 20:42:13 -0400 (Thu, 09 Oct 2008) | 12 lines Don't include logger.h in asterisk.h by default as it is causing problems building app_voicemail. Instead, include it where it is needed. This turned out to be a relatively minor issue because other headers include logger.h as well. Need to test -addons before merging this back to 1.6.0. (closes issue #13605) Reported by: tomo1657 Patches: 13605_seanbright.diff uploaded by seanbright (license 71) Tested by: mmichelson ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@148204 f38db490-d61c-443f-a65b-d21fe96a405b
2008-09-29Merged revisions 145076 via svnmerge from tilghman1-30/+56
https://origsvn.digium.com/svn/asterisk/trunk ........ r145076 | tilghman | 2008-09-28 16:39:07 -0500 (Sun, 28 Sep 2008) | 4 lines Change several improper "sizeof" to "strlen", as sizeof in that context would incorrectly use the size of a pointer, rather than the length of a string. (Closes issue #13574) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@145123 f38db490-d61c-443f-a65b-d21fe96a405b
2008-09-09Merged revisions 142280 via svnmerge from phsultan1-6/+7
https://origsvn.digium.com/svn/asterisk/trunk ........ r142280 | phsultan | 2008-09-10 00:08:56 +0200 (Wed, 10 Sep 2008) | 6 lines Disable autoprune by default. (closes issue #13411) Reported by: caio1982 Patches: res_jabber_autoprune1.diff uploaded by caio1982 (license 22) Tested by: caio1982 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@142281 f38db490-d61c-443f-a65b-d21fe96a405b
2008-09-06Merged revisions 141504 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r141504 | tilghman | 2008-09-06 10:26:45 -0500 (Sat, 06 Sep 2008) | 12 lines Merged revisions 141503 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r141503 | tilghman | 2008-09-06 10:23:42 -0500 (Sat, 06 Sep 2008) | 4 lines Reverting behavior change (AGI should not exit non-zero on SUCCESS) (closes issue #13434) Reported by: francesco_r ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@141505 f38db490-d61c-443f-a65b-d21fe96a405b
2008-09-04Merged revisions 141115 via svnmerge from murf2-434/+860
https://origsvn.digium.com/svn/asterisk/trunk ................ r141115 | murf | 2008-09-04 17:31:41 -0600 (Thu, 04 Sep 2008) | 78 lines Merged revisions 141094 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r141094 | murf | 2008-09-04 17:15:07 -0600 (Thu, 04 Sep 2008) | 70 lines (closes issue #13357) Reported by: pj Tested by: murf (closes issue #13416) Reported by: yarns Tested by: murf If you find this message overly verbose, relax, it's probably not meant for you. This message is meant for probably only two people in the whole world: me, or the poor schnook that has to maintain this code because I'm either dead or unavailable at the moment. This fix solves two reports, both having to do with embedding a function call in a ${} construct. It was tricky because the funccall syntax has parenthesis () in it. And up till now, the 'word' token in the flex stuff didn't allow that, because it would tend to steal the LP and RP tokens. To be truthful, the "word" token was the trickiest, most unstable thing in the whole lexer. I was lucky it made this long without complaints. I had to choose every character in the pattern with extreme care, and I knew that someday I'd have to revisit it. Well, the day has come. So, my brilliant idea (and I'm being modest), was to use the surrounding ${} construct to make a state machine and capture everything in it, no matter what it contains. But, I have to now treat the word token like I did with comments, in that I turn the whole thing into a state-machine sort of spec, with new contexts "curlystate", "wordstate", and "brackstate". Wait a minute, "brackstate"? Yes, well, it didn't take very many regression tests to point out if I do this for ${} constructs, I also have to do it with the $[] constructs, too. I had to create a separate pcbstack2 and pcbstack3 because these constructs can occur inside macro argument lists, and when we have two state machines operating on the same structures we'd get problems otherwise. I guess I could have stopped at pcbstack2 and had the brackstate stuff share it, but it doesn't hurt to be safe. So, the pcbpush and pcbpop routines also now have versions for "2" and "3". I had to add the {KEYWORD} construct to the initial pattern for "word", because previously word would match stuff like "default7", because it was a longer match than the keyword "default". But, not any more, because the word pattern only matches only one or two characters now, and it will always lose. So, I made it the winner again by making an optional match on any of the keywords before it's normal pattern. I added another regression test to make sure we don't lose this in future edits, and had to fix just one regression, where it no longer reports a 'cascaded' error, which I guess is a plus. I've given some thought as to whether to apply these fixes to 1.4 and the 1.6.x releases, vs trunk; I decided to put it in 1.4 because one of the bug reports was against 1.4; and it is unexpected that AEL cannot handle this situation. It actually reduced the amount of useless "cascade" error messages that appeared in the regressions (by one line, ehhem). There is a possible side-effect in that it does now do more careful checking of what's in those ${} constructs, as far as matching parens, and brackets are concerned. Some users may find a an insidious problem and correct it this way. This should be exceedingly rare, I hope. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@141116 f38db490-d61c-443f-a65b-d21fe96a405b
2008-09-04Merged revisions 141039 via svnmerge from jpeeler1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r141039 | jpeeler | 2008-09-04 12:27:56 -0500 (Thu, 04 Sep 2008) | 15 lines Merged revisions 141028 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r141028 | jpeeler | 2008-09-04 12:00:29 -0500 (Thu, 04 Sep 2008) | 7 lines (closes issue #11979) Fixes multiple parking problems: Crash when executing a park on an extension dialed by AGI due to not returning the proper return code. Crash when using a builtin feature that was a subset of a enabled dynamic feature. Crash due to always hanging up the peer despite the fact that the peer was supposed to be parked. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@141086 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-19Merged revisions 138845 via svnmerge from murf3-251/+255
https://origsvn.digium.com/svn/asterisk/trunk ........ r138845 | murf | 2008-08-19 10:31:24 -0600 (Tue, 19 Aug 2008) | 1 line Oops. put a decl in a generated file. My bad, but fixed now. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138847 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-19Merged revisions 138815 via svnmerge from murf3-288/+321
https://origsvn.digium.com/svn/asterisk/trunk ........ r138815 | murf | 2008-08-19 09:59:12 -0600 (Tue, 19 Aug 2008) | 19 lines These changes are in regards to bug 13249, where users are being surprised by the changes made to the Set app in trunk/1.6.x, as they come from the 1.4 world. They are only bitten if they write their AEL dialplan in the 1.4 world, and then carry it over to a trunk/1.6.x installation where a "make samples" was executed, or where they hand-edited the asterisk.conf file and added the [compat] category with app_set = 1.6 (or higher). (this commit does not totally solve 13249, at least not yet) The change involves issueing a single warning while the AEL file is loading, if: 1. app_set is present in the config file, and set to 1.6 or higher. 2. there are double quotes in an assignment statement (eg x = "hi there";) 3. the warning was not already issued. The standalone app, aelparse, does not (yet) issue this warning. I'd have to have it read in the asterisk.conf file, and that's a bit of hassle. I'll add it if users request it, tho. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138846 f38db490-d61c-443f-a65b-d21fe96a405b