aboutsummaryrefslogtreecommitdiffstats
path: root/res
AgeCommit message (Collapse)AuthorFilesLines
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
2008-08-11Merged revisions 137150 via svnmerge from tilghman1-3/+14
https://origsvn.digium.com/svn/asterisk/trunk ................ r137150 | tilghman | 2008-08-10 19:25:28 -0500 (Sun, 10 Aug 2008) | 13 lines Merged revisions 137138 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r137138 | tilghman | 2008-08-10 19:20:38 -0500 (Sun, 10 Aug 2008) | 5 lines Deallocate database connection handle on disconnect, as we allocate another one on connect. (closes issue #13271) Reported by: dveiga ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@137160 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-09Merged revisions 136859 via svnmerge from tilghman1-16/+23
https://origsvn.digium.com/svn/asterisk/trunk ........ r136859 | tilghman | 2008-08-08 20:15:38 -0500 (Fri, 08 Aug 2008) | 4 lines Update documentation as to the behavior of AGI in 1.6.0 and higher. Also, add an OOB message that answers the question of, if AGI no longer shuts down the connection on hangup, how will FastAGI know when to stop processing the call? ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@136860 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-08Merged revisions 136746 via svnmerge from murf1-16/+339
https://origsvn.digium.com/svn/asterisk/trunk ................ r136746 | murf | 2008-08-07 18:48:35 -0600 (Thu, 07 Aug 2008) | 40 lines Merged revisions 136726 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r136726 | murf | 2008-08-07 18:15:34 -0600 (Thu, 07 Aug 2008) | 32 lines (closes issue #13236) Reported by: korihor Wow, this one was a challenge! I regrouped and ran a new strategy for setting the ~~MACRO~~ value; I set it once per extension, up near the top. It is only set if there is a switch in the extension. So, I had to put in a chunk of code to detect a switch in the pval tree. I moved the code to insert the set of ~~exten~~ up to the beginning of the gen_prios routine, instead of down in the switch code. I learned that I have to push the detection of the switches down into the code, so everywhere I create a new exten in gen_prios, I make sure to pass onto it the values of the mother_exten first, and the exten next. I had to add a couple fields to the exten struct to accomplish this, in the ael_structs.h file. The checked field makes it so we don't repeat the switch search if it's been done. I also updated the regressions. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@136778 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-06Merged revisions 136005 via svnmerge from oej1-39/+52
https://origsvn.digium.com/svn/asterisk/trunk ........ r136005 | oej | 2008-08-06 15:34:08 +0200 (Ons, 06 Aug 2008) | 6 lines - Formatting - Changing debug messages from VERBOSE to DEBUG channel - Adding a few todo's - Adding a few more "XMPP"'s to compliment Jabber... ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@136006 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-31Merged revisions 134977 via svnmerge from tilghman1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r134977 | tilghman | 2008-07-31 16:53:59 -0500 (Thu, 31 Jul 2008) | 2 lines Switch command order, to meet with current specs ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@134979 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30Merged revisions 134481 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r134481 | tilghman | 2008-07-30 14:05:35 -0500 (Wed, 30 Jul 2008) | 13 lines Merged revisions 134480 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r134480 | tilghman | 2008-07-30 14:03:44 -0500 (Wed, 30 Jul 2008) | 5 lines launch_netscript sometimes returns -1, which fails to set AGISTATUS. Map failure to -1, so that AGISTATUS is always set. (closes issue #13199) Reported by: smw1218 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@134482 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-19Merged revisions 132277 via svnmerge from mvanbaak1-10/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r132277 | mvanbaak | 2008-07-19 12:46:12 +0200 (Sat, 19 Jul 2008) | 7 lines fix a couple of comments in sqlite resource driver. (closes issue #13110) Reported by: gknispel_proformatique Patches: res_config_sqlite_comments.patch uploaded by gknispel (license 261) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@132278 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-17Merged revisions 131753 via svnmerge from tilghman1-0/+6
https://origsvn.digium.com/svn/asterisk/trunk ........ r131753 | tilghman | 2008-07-17 13:36:34 -0500 (Thu, 17 Jul 2008) | 6 lines Fix memory leaks (closes issue #13099) Reported by: gknispel_proformatique Patches: res_config_sqlite_leak_on_error.patch uploaded by gknispel (license 261) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131754 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-17Merged revisions 131681 via svnmerge from tilghman1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r131681 | tilghman | 2008-07-17 10:45:25 -0500 (Thu, 17 Jul 2008) | 4 lines Fix memory leak. (Closes issue #13096) Reported by gknispel_proformatique ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131682 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-16Merged revisions 131361 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r131361 | mmichelson | 2008-07-16 14:57:02 -0500 (Wed, 16 Jul 2008) | 9 lines Don't try to dereference the dbfile pointer if we know that it's NULL. (closes issue #13092) Reported by: gknispel_proformatique Patches: trunk_sqlite_check_vars_null.patch uploaded by gknispel (license 261) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131362 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-16Merged revisions 131243 via svnmerge from murf1-6/+19
https://origsvn.digium.com/svn/asterisk/trunk ................ r131243 | murf | 2008-07-16 11:59:33 -0600 (Wed, 16 Jul 2008) | 27 lines Merged revisions 131242 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r131242 | murf | 2008-07-16 11:53:43 -0600 (Wed, 16 Jul 2008) | 19 lines (closes issue #13090) Reported by: murf The problem was that, esoteric as it is, because the hangerupper context immediately preceded the std-priv-extent macro, that the checking code accidentally would fall from traversing hangerupper into the std-priv-exten macro, where it would hit the hangerupper in the 'includes', and proceed into an infinite recursion. A small fix to traverse into the statements of the context instead of the context solves this issue. I also added some commented out printfs for debug, which were pretty handy in the face of a dorky gdb. This was a problem around since the package was first written; but evidently pretty rare in turning up in the field. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131248 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-15Merged revisions 131072 via svnmerge from russell1-2/+6
https://origsvn.digium.com/svn/asterisk/trunk ........ r131072 | russell | 2008-07-15 13:46:40 -0500 (Tue, 15 Jul 2008) | 5 lines Fix a couple of places in res_agi where the agi_commands lock would not be released, causing a deadlock. (Reported by mvanbaak in #asterisk-dev, discovered by bbryant's change to the lock tracking code to yell at you if a thread exits with a lock still held) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131073 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-15Merged revisions 130145 via svnmerge from murf6-325/+332
https://origsvn.digium.com/svn/asterisk/trunk Merging this rev from trunk to 1.6.0 was not simple. Why? Because we've enhanced trunk to do a [fast] merge-and-delete operation which also solved problems with contexts having entries from different registrars. Fast as in the amount of time the contexts are locked down. That *is* fast, but traversing the entire dialplan looking for priorities to delete takes more time overall. This particular fix involved pulling in those enhancements from trunk, along with all the various fixes and refinements made along the way. Merging all this from trunk into 1.6 involved: a. mergetrunk6 in the stuff from 130145; b. revert all but the prop changes c. catalog all revisions to pbx.c since 1.6.0 was forked (at rev 105596). d. catalog all revisions to pbx.c in trunk since 1.6.0 was forked, making special note of all revs that were not merged into 1.6.0. e. study each rev in trunk not applied to 1.6.0, and determine if it was involved in the merge_and_delete enhancements in trunk. 25 commits were done in 1.6.0, all but one (106306) was a merge from trunk. Trunk had 22 additional changes, of which 7 were involved in the merge_and_delete enhancements: 106757 108894 109169 116461 123358 130145 130297 f. Go to trunk and collect patches, one by one, of the changes made by each rev across the entire source tree, using svn diff -c <num> > pfile g. Apply each patch in order to 1.6.0, and resolve all failures and compilation problems before proceding to the next patch. h. test the stuff. i. profit! ........ r130145 | murf | 2008-07-11 12:24:31 -0600 (Fri, 11 Jul 2008) | 40 lines (closes issue #13041) Reported by: eliel Tested by: murf (closes issue #12960) Reported by: mnicholson In this 'omnibus' fix, I **think** I solved both the problem in 13041, where unloading pbx_ael.so caused crashes, or incomplete removal of previous registrar'ed entries. And I added code to completely remove all includes, switches, and ignorepats that had a matching registrar entry, which should appease 12960. I also added a lot of seemingly useless brackets around single statement if's, which helped debug so much that I'm leaving them there. I added a routine to check the correlation between the extension tree lists and the hashtab tables. It can be amazingly helpful when you have lots of dialplan stuff, and need to narrow down where a problem is occurring. It's ifdef'd out by default. I cleaned up the code around the new CIDmatch code. It was leaving hanging extens with bad ptrs, getting confused over which objects to remove, etc. I tightened up the code and changed the call to remove_exten in the merge_and_delete code. I added more conditions to check for empty context worthy of deletion. It's not empty if there are any includes, switches, or ignorepats present. If I've missed anything, please re-open this bug, and be prepared to supply example dialplan code. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130946 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-13Merged revisions 130578 via svnmerge from mvanbaak1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r130578 | mvanbaak | 2008-07-14 01:14:03 +0200 (Mon, 14 Jul 2008) | 15 lines Make all sed calls Posix sed compatible. To make sure nobody commits script-modified files we first make a backup of asterisk.tex, run the script, generate the pdf and / or html, and put the original asterisk.tex back. This will guard us for the stuff that happened before that someone committed a locally modified asterisk.tex, with changes done by this script. (closes issue #13062) Reported by: mvanbaak Patches: sed_without-i-v3.diff uploaded by mvanbaak (license 7) Tested by: mvanbaak Feedback from Corydon. Thanks for taking the time to go through this. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130582 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-11Merged revisions 129864 via svnmerge from seanbright2-17/+17
https://origsvn.digium.com/svn/asterisk/trunk ........ r129864 | seanbright | 2008-07-10 20:55:06 -0400 (Thu, 10 Jul 2008) | 1 line Fix some usages of snprintf, and clarify a couple variable names. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@129865 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-10Merged revisions 129758 via svnmerge from tilghman1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r129758 | tilghman | 2008-07-10 16:23:23 -0500 (Thu, 10 Jul 2008) | 10 lines Merged revisions 129741 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r129741 | tilghman | 2008-07-10 16:19:48 -0500 (Thu, 10 Jul 2008) | 2 lines Oops ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@129764 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-08Merged revisions 129045 via svnmerge from bbryant1-4/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r129045 | bbryant | 2008-07-08 11:40:28 -0500 (Tue, 08 Jul 2008) | 7 lines Janitor project to convert sizeof to ARRAY_LEN macro. (closes issue #13002) Reported by: caio1982 Patches: janitor_arraylen5.diff uploaded by caio1982 (license 22) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@129046 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-27Merged revisions 125703 via svnmerge from phsultan1-14/+18
https://origsvn.digium.com/svn/asterisk/trunk ........ r125703 | phsultan | 2008-06-27 09:28:17 +0200 (Fri, 27 Jun 2008) | 1 line Fix a compile time error that occurs if OpenSSL is not installed. Reported by Noel Morais on the users mailing list ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125704 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-26Merged revisions 125279 via svnmerge from kpfleming1-0/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r125279 | kpfleming | 2008-06-26 07:09:24 -0500 (Thu, 26 Jun 2008) | 2 lines fix compile failure found by buildbot (go, buildbot!) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125280 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-25Merged revisions 125138 via svnmerge from kpfleming1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r125138 | kpfleming | 2008-06-25 18:05:28 -0500 (Wed, 25 Jun 2008) | 18 lines Merged revisions 125132 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r125132 | kpfleming | 2008-06-25 17:21:30 -0500 (Wed, 25 Jun 2008) | 10 lines allow tonezone to live in a different place than DAHDI/Zaptel, since dahdi-tools and dahdi-linux are now separate packages and can be installed in different places don't include tonezone.h in dahdi_compat.h, because only a couple of modules need it get app_rpt building again after the DAHDI changes (closes issue #12911) Reported by: tzafrir ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125146 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-24Merged revisions 124872 via svnmerge from phsultan1-20/+27
https://origsvn.digium.com/svn/asterisk/trunk ........ r124872 | phsultan | 2008-06-24 19:50:22 +0200 (Tue, 24 Jun 2008) | 6 lines Subscribe to buddy's presence only if we really need to. That is, if the corresponding roster item has a subscription value set to "none" or "from". Make the code more readable. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@124873 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-24Merged revisions 124870 via svnmerge from phsultan1-29/+31
https://origsvn.digium.com/svn/asterisk/trunk ........ r124870 | phsultan | 2008-06-24 19:28:39 +0200 (Tue, 24 Jun 2008) | 1 line Code simplification ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@124871 f38db490-d61c-443f-a65b-d21fe96a405b