summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-09-12Merged revisions 142927 via svnmerge from Jeff Peeler
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r142927 | jpeeler | 2008-09-12 17:22:28 -0500 (Fri, 12 Sep 2008) | 6 lines (closes issue #12965) Reported by: rlsutton2 Prevents local channels from playing MOH at each other which was causing ast_generic_bridge to loop much faster. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142929 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12Merged revisions 142865 via svnmerge from Tilghman Lesher
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r142865 | tilghman | 2008-09-12 15:37:18 -0500 (Fri, 12 Sep 2008) | 11 lines Create rules for disallowing contacts at certain addresses, which may improve the security of various installations. As this does not change any default behavior, it is not classified as a direct security fix for anything within Asterisk, but may help PBX admins better secure their SIP servers. (closes issue #11776) Reported by: ibc Patches: 20080829__bug11776.diff.txt uploaded by Corydon76 (license 14) Tested by: Corydon76, blitzrage ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142866 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12Recorded merge of revisions 142807 via svnmerge from Michiel van Baak
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r142807 | mvanbaak | 2008-09-12 19:59:25 +0200 (Fri, 12 Sep 2008) | 2 lines fix copyright year range ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142808 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12When checking for an encoded character, make sure the string isn't blank, first.Tilghman Lesher
(Closes issue #13470) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142748 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12Merged revisions 142744 via svnmerge from Tilghman Lesher
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r142744 | tilghman | 2008-09-12 11:38:02 -0500 (Fri, 12 Sep 2008) | 4 lines Missing merge from 1.2 fixes errant exit on DTMF, only when language is Italian (cf commit 34242) (Closes issue #7353) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142745 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12Merged revisions 142740 via svnmerge from Tilghman Lesher
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r142740 | tilghman | 2008-09-12 11:27:32 -0500 (Fri, 12 Sep 2008) | 4 lines Don't return a free'd pointer, when a file cannot be opened. (closes issue #13462) Reported by: wackysalut ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142741 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12Merged revisions 142675 via svnmerge from Steve Murphy
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r142675 | murf | 2008-09-11 22:29:34 -0600 (Thu, 11 Sep 2008) | 29 lines Tested by: sergee, murf, chris-mac, andrew, KNK This is a "second attempt" to restore the previous "endbeforeh" behavior in 1.4 and up. In order to capture information concerning all the legs of transfers in all their infinite combinations, I was forced to this particular solution by a chain of logical necessities, the first being that I was not allowed to rewrite the CDR mechanism from the ground up! This change basically leaves the original machinery alone, which allows IVR and local channel type situations to generate CDR's as normal, but a channel flag can be set to suppress the normal running of the h exten. That flag would be set by the code that runs the h exten from the ast_bridge_call routine, to prevent the h exten from being run twice. Also, a flag in the ast_bridge_config struct passed into ast_bridge_call can be used to suppress the running of the h exten in that routine. This would happen, for instance, if you use the 'g' option in the Dial app. Running this routine 'early' allows not only the CDR() func to be used in the h extension for reading CDR variables, but also allows them to be modified before the CDR is posted to the backends. While I dearly hope that this patch overcomes all problems, and introduces no new problems, reality suggests that surely someone will have problems. In this case, please re-open 13251 (or 13289), and we'll see if we can't fix any remaining issues. ** trunk note: some code to suppress the h exten being run from app_queue was added; for the 'continue' option available only in trunk/1.6.x. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142676 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12Build under dev-modeSean Bright
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142635 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-11Merged revisions 142575 via svnmerge from Steve Murphy
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r142575 | murf | 2008-09-11 16:55:49 -0600 (Thu, 11 Sep 2008) | 20 lines (closes issue #13364) Reported by: mdu113 Well, fundamentally, the problems revealed in 13364 are because of the ForkCDR call that is done before the dial. When the bridge is in place, it's dealing with the first (and wrong) cdr in the list. So, I wrote a little func to zip down to the first non-locked cdr in the chain, and thru-out the ast_bridge_call, these results are used instead of raw chan->cdr and peer->cdr pointers. This shouldn't affect anyone who isn't forking cdrs before a dial, and should correct the cdr's of those that do. So, this change ends up correcting the dstchannel and userfield; the disposition was fixed by a previous patch, it was OK coming into this problem. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142576 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-11Add usegmtime, as per the recent -users list discussion, and also add myTilghman Lesher
explanation to the file, since that additional text helps people understand the concept. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142536 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-10Merged revisions 142474 via svnmerge from Steve Murphy
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r142474 | murf | 2008-09-10 15:58:17 -0600 (Wed, 10 Sep 2008) | 30 lines (closes issue #12318) Reported by: krtorio I made a small change to the code that handles local channel situations. In that code, I copy the answer time from the peer cdr, to the bridge_cdr, but I wasn't also copying the disposition from the peer cdr. So, Now I copy the disposition, and I've tested against these cases: 1. phone 1 never answers the phone; no cdr is generated at all. this should show up as a manager command failure or something. 2. phone 2 never answers. CDR is generated, says NO ANSWER 3. phone 2 is busy. CDR is generated, says BUSY 4. phone 2 answers: CDR is generated, times are correct; disposition is ANSWERED, which is correct. The start time is the time that the manager dialed the first phone. The answer time is the time the second phone picks up. I purposely left the cid and src fields blank; since this call really originates from the manager, there is no 'easy' data to put in these fields. If you feel strongly that these fields should be filled in, re-open this bug and I'll dig further. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142475 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-10Merged revisions 142416 via svnmerge from Sean Bright
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r142416 | seanbright | 2008-09-10 15:05:46 -0400 (Wed, 10 Sep 2008) | 9 lines Fix detection of PWLIB and OpenH323 version when spacing in the headers isn't consistent. (closes issue #13426) Reported by: bamby Patches: detect_openh323.diff uploaded by bamby (license 430) (Modified by me to use sed instead of tr) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142417 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-10Merged revisions 142358 via svnmerge from Tilghman Lesher
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r142358 | tilghman | 2008-09-10 11:54:29 -0500 (Wed, 10 Sep 2008) | 2 lines Publish new extra sounds version. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142359 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-10Merged revisions 142354 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r142354 | russell | 2008-09-10 11:39:53 -0500 (Wed, 10 Sep 2008) | 7 lines It is a normal situation that a task gets put in the scheduler that should run as soon as possible. Accept "0" as an acceptable time to run, and also treat negative as "run now", and don't print a debug message about it. (inspired by a message asking about the "request to schedule in the past" debug message on the -dev list) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142355 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-10Move last change to CHANGES up to the 1.6.2 sectionRussell Bryant
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142318 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09Disable autoprune by default.Philippe Sultan
(closes issue #13411) Reported by: caio1982 Patches: res_jabber_autoprune1.diff uploaded by caio1982 (license 22) Tested by: caio1982 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142280 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09Merged revisions 142218 via svnmerge from Mark Michelson
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r142218 | mmichelson | 2008-09-09 14:15:28 -0500 (Tue, 09 Sep 2008) | 14 lines Make sure that the branch sent in CANCEL requests matches the branch of the INVITE it is cancelling. (closes issue #13381) Reported by: atca_pres Patches: 13381v2.patch uploaded by putnopvut (license 60) Tested by: atca_pres (closes issue #13198) Reported by: rickead2000 Tested by: rickead2000 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142219 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09Cleaned up commentRichard Mudgett
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142181 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09This is the trunk version of the patch to closeMark Michelson
issue 12979. The difference between this and the 1.6.0 and 1.6.1 versions is that this is a much more invasive change. With this, we completely get rid of the interfaces list, along with all its helper functions. Let me take a moment to say that this change personally excites me since it may mean huge steps forward regarding proper lock order in app_queue without having to strew seemingly unnecessary locks all over the place. It also results in a huge reduction in lines of code and complexity. Way to go Brett! (closes issue #12979) Reported by: sigxcpu Patches: 20080710_issue12979_queue_custom_state_interface_trunk_2.diff uploaded by bbryant (license 36) Tested by: sigxcpu, putnopvut git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142146 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09Merged revisions 142079 via svnmerge from Mark Michelson
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r142079 | mmichelson | 2008-09-09 11:19:17 -0500 (Tue, 09 Sep 2008) | 21 lines When determining if codecs used by SIP peers allow the media to be natively bridged, use the jointcapability instead of the peercapability. It seems that the intent of using the peercapability was to expand the choice of codecs for the call to increase the chances of being able to native bridge the channels. The problem is that if a codec were settled on for the native bridge and that wasn't a codec that was configured to be used by Asterisk for that peer, then Asterisk would send a REINVITE with no codecs in the SDP which is a bug no matter how you slice it. (closes issue #13076) Reported by: ramonpeek Patches: 13076.patch uploaded by putnopvut (license 60) Tested by: tbelder ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142080 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09Merged revisions 142063 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r142063 | russell | 2008-09-09 10:40:24 -0500 (Tue, 09 Sep 2008) | 5 lines Ensure that the stored CDR reference is still valid after the bridge before poking at it. Also, keep the channel locked while messing with this CDR. (fixes crashes reported in issue #13409) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142064 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09Minor fix to docoBradley Latus
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142000 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09Use ast_debug for debug messages. I was wondering why debugMark Michelson
messages weren't showing up when I had set the debug level high for just app_queue.c. It's because we were only checking the global option_debug variable instead of using the awesome macro which checks both the global and file-specific value git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141998 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09Fix a memory leak in chan_ossMark Michelson
(closes issue #13311) Reported by: eliel Patches: chan_oss.c.patch uploaded by eliel (license 64) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141995 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09Modify ast_answer() to not hold the channel lock while calling ast_safe_sleep()Russell Bryant
or when calling ast_waitfor(). These are inappropriate times to hold the channel lock. This is what has caused "could not get the channel lock" messages from chan_sip and has likely caused a negative impact on performance results of SIP in Asterisk 1.6. Thanks to file for pointing out this section of code. (closes issue #13287) (closes issue #13115) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141949 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-08Optimization: The only reason we should check memberMark Michelson
status is if the queue has a joinempty or a leavewhenempty setting which could cause the caller to not join the queue or exit the queue. Prior to this patch, we could potentially traverse the entire queue's member list for no reason since even if the members are currently not available in some way we're going to let the caller join the queue anyway. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141906 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-08Um, apparently I didn't actually finish merging before committing.Mark Michelson
Bad bad bad git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141868 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-08Merged revisions 141809 via svnmerge from Mark Michelson
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r141809 | mmichelson | 2008-09-08 16:10:10 -0500 (Mon, 08 Sep 2008) | 14 lines Fix pedantic mode of chan_sip to only check the remote tag of an endpoint once a dialog has been confirmed. Up until that point, it is possible and legal for the far-end to send provisional responses with a different To: tag each time. With this patch applied, these provisional messages will not cause a matching problem. (closes issue #11536) Reported by: ibc Patches: 11536v2.patch uploaded by putnopvut (license 60) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141810 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-08Merged revisions 141806 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r141806 | russell | 2008-09-08 16:02:36 -0500 (Mon, 08 Sep 2008) | 7 lines When doing an async goto, detect if the channel is already in the middle of a masquerade. This can happen when chan_local is trying to optimize itself out. If this happens, fail the async goto instead of bursting into flames. (closes issue #13435) Reported by: geoff2010 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141807 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-08Merged revisions 141741 via svnmerge from Jason Parker
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r141741 | qwell | 2008-09-08 15:15:42 -0500 (Mon, 08 Sep 2008) | 8 lines Remove RPM package targets from Makefile (and all associated parts). This has never worked in 1.4, and we decided that it makes no sense to be done here. There are many distros out there that already have "proper" spec files that can be (re)used. Closes issue #13113 Closes issue #10950 Closes issue #10952 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141745 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-08Quote the arguments to grep so that sh on various platforms doesn't chokeSean Bright
on the special characters (like ^). (closes issue #13417) Reported by: dougm Patches: 13417.make_buildopts_h.patch uploaded by seanbright (license 71) Tested by: dougm git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141682 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-08Blocked revisions 141678 via svnmergeRussell Bryant
........ r141678 | russell | 2008-09-08 11:26:00 -0500 (Mon, 08 Sep 2008) | 4 lines Actually use Zaptel CFLAGS if using Zaptel instead of DAHDI This fixes building against Zaptel when using a custom path ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141679 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-07make func_curl.c compile under devmode.Michiel van Baak
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141626 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-06Merged revisions 141565 via svnmerge from Steve Murphy
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r141565 | murf | 2008-09-06 14:13:16 -0600 (Sat, 06 Sep 2008) | 1 line This fix comes from Joshua Colp The Brilliant, who, given the trace, came up with a solution. This will most likely will close 13235 and 13409. I'll wait till Monday to verify, and then close these bugs. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141566 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-06Get rid of the casts that cause warnings on OpenBSD. The compiler is errantlyTilghman Lesher
detecting warnings when we redefine a structure each time it is used, even though the structure is identical. Reported by: mvanbaak, via #asterisk-dev git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141507 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-06Merged revisions 141503 via svnmerge from Tilghman Lesher
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: https://origsvn.digium.com/svn/asterisk/trunk@141504 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-06Some fixes to autocompletion in some commands.Michiel van Baak
Changes applied by this patch: - Fix autocompletion in 'sip prune realtime', sip peers where never auto completed. Now we complete this command with: 'sip prune realtime peer' -> all | like | sip peers Also I have modified the syntax in the usage, was wrong... - Pass ast_cli_args->argv and ast_cli_args->argc while running autocompletion on CLI commands (CLI_GENERATE). With this we avoid comparisons on ast_cli_args->line like this: strcasestr(a->line, " description") strcasestr(a->line, "descriptions ") strcasestr(a->line, "realtime peer"), and so on.. Making the code more confusing (check the spaces in description!). The only thing we must be sure is to first check a->pos or a->argc. - Fix 'iax2 prune realtime' autocompletion, now we autocomplete this command with 'all' & 'iax2 peers', check a look that iax2 peers where all the peers, now only the ones in the cache.. (closes issue #13133) Reported by: eliel Patches: clichanges.patch uploaded by eliel (license 64) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141464 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-05Fix func_curl compilationMark Michelson
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141425 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-05Merged revisions 141366 via svnmerge from Mark Michelson
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r141366 | mmichelson | 2008-09-05 16:10:32 -0500 (Fri, 05 Sep 2008) | 7 lines Agent's should not try to call a channel's indicate callback if the channel has been hung up. It will likely crash otherwise ABE-1159 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141367 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-05Add the CURLOPT dialplan function, which permits setting various options forTilghman Lesher
use with the CURL dialplan function. (closes issue #12920) Reported by: davevg Patches: 20080904__bug12920.diff.txt uploaded by Corydon76 (license 14) Tested by: Corydon76, davevg git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141328 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-05Blocked revisions 141267 via svnmergeMark Michelson
........ r141267 | mmichelson | 2008-09-05 11:35:54 -0500 (Fri, 05 Sep 2008) | 11 lines Since greetings are not stored in IMAP, we should not be DISPOSE'ing of them the same way we do with other messages. (closes issue #13414) Reported by: mthomasslo Patches: 13414v2.patch uploaded by putnopvut (license 60) Tested by: mthomasslo ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141271 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-05Blocked revisions 141217 via svnmergeMark Michelson
........ r141217 | mmichelson | 2008-09-05 11:00:24 -0500 (Fri, 05 Sep 2008) | 14 lines Commit 140417 had a logic flaw in it which caused port 5060 to always be used when dialing a peer if no explicit port was specified. This broke the behavior of implicitly using the port from which the peer registered if no port is specified. This commit fixes the logic flaw. (closes issue #13424) Reported by: mdu113 Patches: 13424.patch uploaded by putnopvut (license 60) Tested by: mdu113 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141218 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-05Merged revisions 141156 via svnmerge from Steve Murphy
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r141156 | murf | 2008-09-05 08:15:43 -0600 (Fri, 05 Sep 2008) | 1 line A small change to prevent double-posting of CDR's; thanks to Daniel Ferrer for bringing it to our attention ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141157 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-04Merged revisions 141094 via svnmerge from Steve Murphy
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: https://origsvn.digium.com/svn/asterisk/trunk@141115 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-04Merged revisions 141028 via svnmerge from Jeff Peeler
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: https://origsvn.digium.com/svn/asterisk/trunk@141039 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03Fix some locking order issues in app_queue. This wasMark Michelson
brought up by atis on IRC a while ago. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140975 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03Added 'skinny show lines verbose'Michiel van Baak
This will print the subs and their status for every line (if any). wedhorn did most of the work with his patch which introduced 'skinny show debug' but a discussion on IRC stated that it should be added to 'skinny show lines' Input on the output format by Qwell on IRC. (closes issue #13344) Reported by: wedhorn git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140938 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03Fix compilationMark Michelson
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140887 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03Merged revisions 140850 via svnmerge from Mark Michelson
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r140850 | mmichelson | 2008-09-03 09:29:15 -0500 (Wed, 03 Sep 2008) | 9 lines Fix voicemail forwarding when using ODBC storage. (closes issue #13387) Reported by: moliveras Patches: 13387.patch uploaded by putnopvut (license 60) Tested by: putnopvut, moliveras ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140860 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03In these changes, I have added some explanationSteve Murphy
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. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140824 65c4cc65-6c06-0410-ace0-fbb531ad65f3