aboutsummaryrefslogtreecommitdiffstats
path: root/res
AgeCommit message (Collapse)AuthorFilesLines
2008-09-04Merged revisions 141115 via svnmerge from murf2-433/+859
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.1@141117 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.1@141042 f38db490-d61c-443f-a65b-d21fe96a405b
2008-09-03Merged revisions 140824 via svnmerge from murf4-268/+287
https://origsvn.digium.com/svn/asterisk/trunk ........ r140824 | murf | 2008-09-03 08:01:27 -0600 (Wed, 03 Sep 2008) | 21 lines In these changes, I have added some explanation of changes to the Set and MSet apps, so people aren't so shocked and surprised when they upgrade from 1.4 to 1.6. Also, for the sake of those upgrading from 1.4 to 1.6 with AEL, I provide automatic support for the "old" way of using Set(), that still does the exact same old thing with quotes and backslashes and so on as 1.4 did, by having AEL compile in the use of MSet() instead of Set(), everywhere it inserts this code. But, if the app_set var is set to 1.6 or higher, it uses the "new", non-evaluative Set(). This only usually happens if the user manually inserts this into the asterisk.conf file, or runs the "make samples" command. (closes issue #13249) Reported by: dimas Patches: ael-MSet.diff uploaded by murf (license 17) Tested by: dimas, murf ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@140886 f38db490-d61c-443f-a65b-d21fe96a405b
2008-09-02Merged revisions 140563 via svnmerge from russell3-718/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r140563 | russell | 2008-09-02 10:09:20 -0500 (Tue, 02 Sep 2008) | 3 lines I'm not sure how these files got to trunk (probably my fault), but they should not be here ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@140565 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-29Merged revisions 140489 via svnmerge from mmichelson3-5/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r140489 | mmichelson | 2008-08-29 12:47:17 -0500 (Fri, 29 Aug 2008) | 30 lines Merged revisions 140488 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r140488 | mmichelson | 2008-08-29 12:34:17 -0500 (Fri, 29 Aug 2008) | 22 lines After working on the ao2_containers branch, I noticed something a bit strange. In all cases where we provide a callback function to ao2_container_alloc, the callback function would only return 0 or CMP_MATCH. After inspecting the ao2_callback() code carefully, I found that if you're only looking for one specific item, then you should return CMP_MATCH | CMP_STOP. Otherwise, astobj2 will continue traversing the current bucket until the end searching for more matches. In cases like chan_iax2 where in 1.4, all the peers are shoved into a single bucket, this makes for potentially terrible performance since the entire bucket will be traversed even if the peer is one of the first ones come across in the bucket. All the changes I have made were for cases where the callback function defined was passed to ao2_container_alloc so that calls to ao2_find could find a unique instance of whatever object was being stored in the container. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@140490 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.1@138855 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.1@138853 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-11Merged revisions 137138 via svnmerge from tilghman1-3/+14
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/trunk@137150 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-10All of the res/ stuff (other than res_jabber) from the RSW branch.seanbright11-136/+136
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@137028 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-09Update documentation as to the behavior of AGI in 1.6.0 and higher. Also, addtilghman1-16/+23
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/trunk@136859 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-08Merged revisions 136726 via svnmerge from murf1-16/+339
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/trunk@136746 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-06- Formattingoej1-39/+52
- 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/trunk@136005 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-05make datastore creation and destruction a generic API since it is not really ↵kpfleming2-3/+3
channel related, and add the ability to add/find/remove datastores to manager sessions git-svn-id: http://svn.digium.com/svn/asterisk/trunk@135680 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-04HTTP module memory leakstilghman1-3/+6
(closes issue #13230) Reported by: eliel Patches: res_http_post_leak.patch uploaded by eliel (license 64) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@135476 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-01Fix mime parsing by re-adding support for passing headers to callback functionstwilson1-2/+4
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@135235 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-31Switch command order, to meet with current specstilghman1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134977 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-31Increase column size beyond the minimum required, since PostgreSQL won't lettilghman1-7/+13
us modify existing columns. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134925 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-31Two errors:tilghman1-23/+32
1) If a function returns SQLITE_LOCKED, no recovery is possible. 2) An error message can be allocated, even when no error is signalled. (closes issue #13109) Reported by: gknispel_proformatique git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134919 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30Merged revisions 134480 via svnmerge from tilghman1-1/+1
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/trunk@134481 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30Add adaptive capabilities to the sqlite realtime drivertilghman1-60/+299
(closes issue #13097) Reported by: gknispel_proformatique Patches: 20080730__bug13097.diff.txt uploaded by Corydon76 (license 14) Tested by: Corydon76 git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134442 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-19fix a couple of comments in sqlite resource driver.mvanbaak1-10/+4
(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/trunk@132277 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-17Fix memory leakstilghman1-0/+6
(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/trunk@131753 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-17Fix memory leak.tilghman1-0/+1
(Closes issue #13096) Reported by gknispel_proformatique git-svn-id: http://svn.digium.com/svn/asterisk/trunk@131681 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-16Don't try to dereference the dbfile pointer ifmmichelson1-1/+1
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/trunk@131361 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-16Merged revisions 131242 via svnmerge from murf1-6/+19
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/trunk@131243 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-15Fix a couple of places in res_agi where the agi_commands lock would not berussell1-2/+6
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/trunk@131072 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-13Make all sed calls Posix sed compatible.mvanbaak1-1/+1
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/trunk@130578 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-11a small change to make things compilemurf1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@130296 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-11Don't copy on NULL.tilghman1-3/+5
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@130234 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-11Add some debug code and add a missing releasetilghman1-0/+25
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@130232 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-11Fix some usages of snprintf, and clarify a couple variable names.seanbright2-17/+17
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@129864 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-10Merged revisions 129741 via svnmerge from tilghman1-1/+3
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/trunk@129758 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-09Code wasn't ready to be merged - see -dev list discussiontilghman1-10/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@129307 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-08Janitor project to convert sizeof to ARRAY_LEN macro.bbryant1-4/+4
(closes issue #13002) Reported by: caio1982 Patches: janitor_arraylen5.diff uploaded by caio1982 (license 22) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@129045 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-05Implement flags for AGI in the channel structure so taht "show channels" andoej1-2/+10
AMI commands can display that a channel is under control of an AGI. Work inspired by work at customer site, but paid for by Edvina AB git-svn-id: http://svn.digium.com/svn/asterisk/trunk@128240 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-01Add AMI events for start/stop of MOHtilghman1-0/+13
(closes issue #12909) Reported by: chris-mac Patches: res_musiconhold-event.patch uploaded by chris-mac (license 506) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@127169 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-01make the AIS checking a little more generic, and have a more useful ↵kpfleming3-8/+9
configure script command line option for OpenAIS git-svn-id: http://svn.digium.com/svn/asterisk/trunk@127017 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-27Fix a compile time error that occurs if OpenSSL is not installed. Reported ↵phsultan1-14/+18
by Noel Morais on the users mailing list git-svn-id: http://svn.digium.com/svn/asterisk/trunk@125703 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-26- add get_max_rate timing API callrussell2-0/+14
- change ast_settimeout() to honor max rate in edge cases of file playback (this will make some warning messages go away at the end of playing back a file) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@125332 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-26fix compile failure found by buildbot (go, buildbot!)kpfleming1-0/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@125279 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-25Merged revisions 125132 via svnmerge from kpfleming2-2/+3
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/trunk@125138 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-25Separate the global initialization routines for cURL into its own separatetilghman2-2/+84
module. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@125055 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-24Subscribe to buddy's presence only if we really need to. That is, ifphsultan1-20/+27
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/trunk@124872 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-24Code simplificationphsultan1-29/+31
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@124870 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-24fix a memory leak.russell1-2/+6
(inspired by, and potentially fixes issue #12917) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@124798 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-21Reduce warning to debug, otherwise we flood the log when we (legitimately)tilghman1-7/+7
can't find a record. (Closes issue #12908) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@124505 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-19Older versions of GNU gcc do not allow 'NULL' as sentinel.mvanbaak2-6/+6
They want (char *)NULL as sentinel. An example is OpenBSD (confirmed on 4.3) that ships with gcc 3.3.4 This commit introduces a contstant SENTINEL which is declared as: #define SENTINEL ((char *)NULL) All places I could test compile on my openbsd system are converted. Update CODING-GUIDELINES to tell about this constant. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@124127 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-19- Make res_timing_pthread allow a max rate of 100/sec instead of 50/secrussell1-5/+4
- change the "timing test" CLI command to let you specify a timing rate to test git-svn-id: http://svn.digium.com/svn/asterisk/trunk@124023 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-19Don't change pointers that need to be later passed back for deallocation.tilghman1-41/+44
(closes issue #12572) Reported by: flyn Patches: 20080613__bug12572.diff.txt uploaded by Corydon76 (license 14) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@123952 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-18Whitespace onlyseanbright1-134/+134
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@123609 f38db490-d61c-443f-a65b-d21fe96a405b