aboutsummaryrefslogtreecommitdiffstats
path: root/apps
AgeCommit message (Collapse)AuthorFilesLines
2008-07-15Merged revisions 130145 via svnmerge from murf4-9/+5
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-14Merged revisions 130794 via svnmerge from mmichelson1-6/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r130794 | mmichelson | 2008-07-14 12:54:11 -0500 (Mon, 14 Jul 2008) | 16 lines Merged revisions 130792 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r130792 | mmichelson | 2008-07-14 12:50:21 -0500 (Mon, 14 Jul 2008) | 8 lines Add a check to the CAN_EARLY_BRIDGE macro in app_dial to be sure there are no audiohooks present on the channels involved. This fixed a one-way audio situation I had in my test setup. I couldn't find any open issues that suggested one-way audio with regards to mixmonitor (or other audiohook) usage, though. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130795 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-11Merged revisions 130129 via svnmerge from bbryant3-6/+6
https://origsvn.digium.com/svn/asterisk/trunk ........ r130129 | bbryant | 2008-07-11 13:09:35 -0500 (Fri, 11 Jul 2008) | 8 lines Janitor patch to change uses of sizeof to ARRAY_LEN (closes issue #13054) Reported by: pabelanger Patches: ARRAY_LEN.patch2 uploaded by pabelanger (license 224) Tested by: seanbright ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130130 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-10Merged revisions 129684 via svnmerge from bbryant1-3/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r129684 | bbryant | 2008-07-10 14:13:12 -0500 (Thu, 10 Jul 2008) | 8 lines Fixes a bug where the interface for a queue member gets reloaded as the state_interface, if a state_interface was set, on reload because the state_interface isn't stored in the ast_db. (closes issue #13043) Reported by: jvandal Patches: app_queue.patch uploaded by jvandal (license 413) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@129685 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-08Merged revisions 129270 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r129270 | mmichelson | 2008-07-08 17:56:12 -0500 (Tue, 08 Jul 2008) | 3 lines Fix compilation error when IMAP storage is enabled ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@129271 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-08Merged revisions 129152 via svnmerge from tilghman1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r129152 | tilghman | 2008-07-08 15:30:29 -0500 (Tue, 08 Jul 2008) | 16 lines Merged revisions 129149 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r129149 | tilghman | 2008-07-08 15:27:47 -0500 (Tue, 08 Jul 2008) | 8 lines Cause SIP to return a 480 instead of a 404 when a sip peer exists, but is not registered. (closes issue #12885) Reported by: ibc Patches: 20080701__bug12885__2.diff.txt uploaded by Corydon76 (license 14) Tested by: ibc ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@129153 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-08Merged revisions 129045 via svnmerge from bbryant3-6/+6
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-07-08Merged revisions 129006 via svnmerge from russell1-7/+7
https://origsvn.digium.com/svn/asterisk/trunk ........ r129006 | russell | 2008-07-08 09:17:37 -0500 (Tue, 08 Jul 2008) | 9 lines Update app_fax for better compatibility with spandsp 0.0.5. Add a call to t38_terminal_release, and make sure that the phase E handler gets called with proper status. (closes issue #13020) Reported by: dimas Patches: v1-appfax.patch uploaded by dimas (license 88) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@129007 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-07Merged revisions 128830 via svnmerge from tilghman1-55/+98
https://origsvn.digium.com/svn/asterisk/trunk ................ r128830 | tilghman | 2008-07-07 18:25:39 -0500 (Mon, 07 Jul 2008) | 10 lines Merged revisions 128812 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r128812 | tilghman | 2008-07-07 18:21:52 -0500 (Mon, 07 Jul 2008) | 2 lines Stop using deprecated method, as requested by Kevin. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@128855 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-07Merged revisions 128733 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r128733 | mmichelson | 2008-07-07 15:30:46 -0500 (Mon, 07 Jul 2008) | 3 lines Crap ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@128735 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-07Merged revisions 128731 via svnmerge from mmichelson1-2/+6
https://origsvn.digium.com/svn/asterisk/trunk ........ r128731 | mmichelson | 2008-07-07 15:28:33 -0500 (Mon, 07 Jul 2008) | 7 lines If imapfolder=foo were set in voicemail.conf, then when calling VoiceMailMain, app_voicemail would attempt to play a file called vm-foo instead of playing vm-INBOX to play the "new" sound file. This commit fixes that issue. This may fix one of the problems reported in issue #12987 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@128732 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-03Merged revisions 127903 via svnmerge from kpfleming1-5/+0
https://origsvn.digium.com/svn/asterisk/trunk ................ r127903 | kpfleming | 2008-07-03 17:23:04 -0500 (Thu, 03 Jul 2008) | 20 lines Merged revisions 127892,127895 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r127892 | kpfleming | 2008-07-03 17:18:38 -0500 (Thu, 03 Jul 2008) | 6 lines a couple of small Solaris-related fixes (closes issue #11885) Reported by: snuffy, asgaroth ........ r127895 | kpfleming | 2008-07-03 17:20:16 -0500 (Thu, 03 Jul 2008) | 3 lines remove this, it has been moved to the main Makefile ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@127905 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-01Merged revisions 127245 via svnmerge from mmichelson1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r127245 | mmichelson | 2008-07-01 18:38:12 -0500 (Tue, 01 Jul 2008) | 13 lines Merged revisions 127244 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r127244 | mmichelson | 2008-07-01 18:36:40 -0500 (Tue, 01 Jul 2008) | 5 lines Add error message to failed open(2) calls inside the copy() function of app_voicemail. This idea came as part of my work in helping to resolve issue #12764. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@127246 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-29finish converting this modulekpfleming1-299/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@126364 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-29don't know how this got missed in the DAHDI conversion of this branchkpfleming1-0/+308
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@126362 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-27Port revisions 124661 and 123650 from trunk to 1.6.0mmichelson1-5/+17
Thanks to Atis Lezdins for pointing this out on the asterisk-dev mailing list git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@126023 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-27Merged revisions 125855 via svnmerge from mmichelson1-1/+8
https://origsvn.digium.com/svn/asterisk/trunk ........ r125855 | mmichelson | 2008-06-27 11:16:13 -0500 (Fri, 27 Jun 2008) | 5 lines Ensure the thread-safety of the monexec variable in app_queue. Thanks to Russell for pointing out the problem ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125859 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-27SENTINEL is not defined in 1.6.0mmichelson1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125684 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-27Merged revisions 125666 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r125666 | mmichelson | 2008-06-26 19:22:03 -0500 (Thu, 26 Jun 2008) | 3 lines Make this compile with dev-mode on ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125668 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-27Merged revisions 125649 via svnmerge from mmichelson1-1/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r125649 | mmichelson | 2008-06-26 19:15:54 -0500 (Thu, 26 Jun 2008) | 15 lines The monitor-join option for queues was deprecated in favor of using MixMonitor to mix audio. However, it was pointed out to me that because of this, the command set for the MONITOR_EXEC variable is ignored as well. This means that people can't do their own custom mixing commands at the end of recordings in order to make, for instance, stereo recordings of calls. With this patch, app_queue will set the "joinfiles" variable for the channel's monitor if MONITOR_EXEC is not zero-length. This means that for normal audio mixing, MixMonitor is still the preferred choice, but we allow custom mixing to be done with the two Monitor streams if desired. (closes issue #12923) Reported by: snyfer ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125650 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-26Merged revisions 125591 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r125591 | mmichelson | 2008-06-26 18:06:18 -0500 (Thu, 26 Jun 2008) | 3 lines Fix a really stupid mistake ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125592 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-26Merged revisions 125586 via svnmerge from mmichelson1-0/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r125586 | mmichelson | 2008-06-26 18:01:02 -0500 (Thu, 26 Jun 2008) | 19 lines Merged revisions 125585 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r125585 | mmichelson | 2008-06-26 17:52:39 -0500 (Thu, 26 Jun 2008) | 11 lines Add the interface of a queue member to the output of the "queue show" command so that it can easily be associated with a queue member's name. This helps so that the appropriate queue member can be removed or paused since the interface is required, not the member's name. (closes issue #12783) Reported by: davevg Patches: app_queue.diff uploaded by davevg (license 209) with small mod from me ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125588 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-26Merged revisions 125531 via svnmerge from mmichelson1-14/+96
https://origsvn.digium.com/svn/asterisk/trunk ................ r125531 | mmichelson | 2008-06-26 17:03:54 -0500 (Thu, 26 Jun 2008) | 17 lines Blocked revisions 125530 via svnmerge ........ r125530 | mmichelson | 2008-06-26 17:02:55 -0500 (Thu, 26 Jun 2008) | 10 lines Backport of attended transfer queue_log patch from trunk. This patch allows for attended transfers to be logged in the queue_log the same way that blind transfers have always been. It was decided by popular opinion on the asterisk-dev mailing list that this should be backported to 1.4. Thanks to everyone who gave an opinion. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125532 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-26Merged revisions 125477 via svnmerge from mmichelson1-5/+19
https://origsvn.digium.com/svn/asterisk/trunk ................ r125477 | mmichelson | 2008-06-26 15:57:41 -0500 (Thu, 26 Jun 2008) | 19 lines Merged revisions 125476 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r125476 | mmichelson | 2008-06-26 15:56:01 -0500 (Thu, 26 Jun 2008) | 11 lines Prior to this patch, the "queue show" command used cached information for realtime queues instead of giving up-to-date info. Now realtime is queried for the latest and greatest in queue info. (closes issue #12858) Reported by: bcnit Patches: queue_show.patch uploaded by putnopvut (license 60) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125478 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-25Merged revisions 125138 via svnmerge from kpfleming5-7/+10
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 124912 via svnmerge from tilghman1-14/+40
https://origsvn.digium.com/svn/asterisk/trunk ................ r124912 | tilghman | 2008-06-24 16:18:52 -0500 (Tue, 24 Jun 2008) | 16 lines Merged revisions 124910 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r124910 | tilghman | 2008-06-24 16:08:52 -0500 (Tue, 24 Jun 2008) | 8 lines Occasionally control characters find their way into CallerID. These need to be stripped prior to placing CallerID in the headers of an email. (closes issue #12759) Reported by: RobH Patches: 20080602__bug12759__2.diff.txt uploaded by Corydon76 (license 14) Tested by: RobH ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@124964 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-22Merged revisions 124541 via svnmerge from murf1-3/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r124541 | murf | 2008-06-21 20:58:06 -0600 (Sat, 21 Jun 2008) | 17 lines Merged revisions 124540 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r124540 | murf | 2008-06-21 20:54:52 -0600 (Sat, 21 Jun 2008) | 9 lines (closes issue #12910) Reported by: chris-mac Sorry, my testing did not contain the simple case of forkCDR(v), I am much embarrassed to admit. If I had, I would have more solidly initialized the opts element for varset. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@124542 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-20Merged revisions 124451 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r124451 | tilghman | 2008-06-20 18:13:21 -0500 (Fri, 20 Jun 2008) | 14 lines Merged revisions 124450 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r124450 | tilghman | 2008-06-20 18:12:33 -0500 (Fri, 20 Jun 2008) | 6 lines usleep with a value over 1,000,000 is nonportable. Changing to use sleep() instead. (closes issue #12814) Reported by: pputman Patches: app_rtp_sleep.patch uploaded by pputman (license 81) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@124452 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-19Merged revisions 124121 via svnmerge from mmichelson1-0/+25
https://origsvn.digium.com/svn/asterisk/trunk ................ r124121 | mmichelson | 2008-06-19 15:30:23 -0500 (Thu, 19 Jun 2008) | 16 lines Merged revisions 124112 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r124112 | mmichelson | 2008-06-19 15:28:41 -0500 (Thu, 19 Jun 2008) | 8 lines Fix IMAP forwarding so that messages are sent to the proper mailbox. (closes issue #12897) Reported by: jaroth Patches: destination_forward.patch uploaded by jaroth (license 50) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@124124 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-18Merged revisions 123652 via svnmerge from mmichelson1-1/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r123652 | mmichelson | 2008-06-18 10:08:56 -0500 (Wed, 18 Jun 2008) | 7 lines A portion of the code which handled the 'c' queue option had been removed. No telling when it happened. Anyway, it's back in now and works properly. (Based on issue reported on mailing list) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@123653 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-18don't use trunk only API for frame datarussell1-4/+4
(closes issue #12881) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@123647 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-18re-add app_fax ... it got accidentally removedrussell1-0/+741
(closes issue #12881) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@123646 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-17Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. ↵jpeeler12-1012/+274
Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@123332 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-17Merged revisions 123275 via svnmerge from mmichelson1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r123275 | mmichelson | 2008-06-17 10:57:43 -0500 (Tue, 17 Jun 2008) | 20 lines Merged revisions 123274 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r123274 | mmichelson | 2008-06-17 10:56:55 -0500 (Tue, 17 Jun 2008) | 12 lines davidw pointed out that the holdtime calculation used by app_queue does not use "boxcar" filtering as the comments say. The term "boxcar" means that the number of samples used to calculate stays constant, with new samples replacing the oldest ones. The queue holdtime calculation uses all holdtime samples collected since the queue was loaded, so the comment has been changed to be accurate. (closes issue #12781) Reported by: davidw ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@123276 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-16Merged revisions 123165 via svnmerge from murf3-3/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r123165 | murf | 2008-06-16 14:43:46 -0600 (Mon, 16 Jun 2008) | 19 lines (closes issue #12689) Reported by: ys Many thanks to ys for doing the research on this problem. I didn't think it would be best to unlock the contexts and then relock them after the remove_extension2() call, so I added an extra arg to remove_extension2() and set it appropriately in each call. There were not that many. I considered forcing the code to lock the contexts before the call to remove_extension2(), but that would require a slightly greater degree of changes, especially since the find_context_locked is local to pbx.c I did a simple sanity test to make sure the code doesn't mess things up in general. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@123173 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-16Fixes and closes bug number 12804ctooley1-6/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@123075 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-13Merged revisions 122433 via svnmerge from jpeeler1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r122433 | jpeeler | 2008-06-12 18:08:37 -0500 (Thu, 12 Jun 2008) | 4 lines (closes issue 0012193) Reported by: davidw Patch by: Corydon76, modified by me to work properly with ParkAndAnnounce app ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@122467 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-12Merged revisions 122312 via svnmerge from mmichelson1-2/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r122312 | mmichelson | 2008-06-12 13:53:17 -0500 (Thu, 12 Jun 2008) | 17 lines Merged revisions 122311 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r122311 | mmichelson | 2008-06-12 13:50:58 -0500 (Thu, 12 Jun 2008) | 9 lines Properly play a holdtime message if the announce-holdtime option is set to "once." (closes issue #12842) Reported by: ramonpeek Patches: patch001.diff uploaded by ramonpeek (license 266) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@122313 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-12Merged revisions 122174 via svnmerge from tilghman1-29/+28
https://origsvn.digium.com/svn/asterisk/trunk ................ r122174 | tilghman | 2008-06-12 10:26:07 -0500 (Thu, 12 Jun 2008) | 16 lines Merged revisions 122137 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r122137 | tilghman | 2008-06-12 10:18:39 -0500 (Thu, 12 Jun 2008) | 8 lines Flipflop the sections for two options, since the section for 'X' (exit context) may otherwise absorb keypresses meant for 's' (admin/user menu). (closes issue #12836) Reported by: blitzrage Patches: 20080611__bug12836.diff.txt uploaded by Corydon76 (license 14) Tested by: blitzrage ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@122180 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-12Merged revisions 122128 via svnmerge from murf1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r122128 | murf | 2008-06-12 08:56:26 -0600 (Thu, 12 Jun 2008) | 9 lines Merged revisions 122127 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r122127 | murf | 2008-06-12 08:51:44 -0600 (Thu, 12 Jun 2008) | 1 line Arkadia tried to warn me, but the code added to ast_cdr_busy, _failed, and _noanswer was redundant. Didn't spot it until I was resolving conflicts in trunk. Ugh. Redundant code removed. It wasn't harmful. Just dumb. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@122129 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-12Merged revisions 122091 via svnmerge from murf1-6/+77
https://origsvn.digium.com/svn/asterisk/trunk ................ r122091 | murf | 2008-06-12 08:28:01 -0600 (Thu, 12 Jun 2008) | 45 lines Merged revisions 122046 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r122046 | murf | 2008-06-12 07:47:34 -0600 (Thu, 12 Jun 2008) | 37 lines (closes issue #10668) Reported by: arkadia Tested by: murf, arkadia Options added to forkCDR() app and the CDR() func to remove some roadblocks for CDR applications. The "show application ForkCDR" output was upgraded to more fully explain the inner workings of forkCDR. The A option was added to forkCDR to force the CDR system to NOT change the disposition on the original CDR, after the fork. This involves ast_cdr_answer, _busy, _failed, and so on. The T option was added to forkCDR to force obedience of the cdr LOCKED flag in the ast_cdr_end, all the disposition changing funcs (ast_cdr_answer, etc), and in the ast_cdr_setvar func. The CHANGES file was updated to explain ALL the new options added to satisfy this bug report (and some requests made verbally and via email, irc, etc, over the past months/year) The 's' option was added to the CDR() func, to force it to skip LOCKED cdr's in the chain. Again, the new options should be totally transparent to existing apps! Current behavior of CDR, forkCDR, and the rest of the CDR system should not change one little bit. Until you add the new options, at least! ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@122126 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-08Merged revisions 121131 via svnmerge from jpeeler1-3/+6
https://origsvn.digium.com/svn/asterisk/trunk ........ r121131 | jpeeler | 2008-06-07 20:16:25 -0500 (Sat, 07 Jun 2008) | 2 lines Fixes segfault when using ParkAndAnnounce. Also, loop made more efficient as announce template only needs to be checked until the number of colon separated arguments run out, not the entire pointer storage array. Was done in a similiar fashion in 1.4, but here we're using less variables. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@121138 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-06Merged revisions 120904 via svnmerge from tilghman1-16/+41
https://origsvn.digium.com/svn/asterisk/trunk ........ r120904 | tilghman | 2008-06-06 12:34:21 -0500 (Fri, 06 Jun 2008) | 3 lines For the purpose of making the changed syntax to ExecIf easier to transition, allow the deprecated syntax (fixed for jmls on -dev). ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@120905 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-05Merged revisions 120602 via svnmerge from tilghman1-10/+27
https://origsvn.digium.com/svn/asterisk/trunk ........ r120602 | tilghman | 2008-06-05 10:58:11 -0500 (Thu, 05 Jun 2008) | 4 lines Conditionally load the AGI command gosub, depending on whether or not res_agi has been loaded, fix a return value in the loader, and ensure that the help workhorse header does not print on load. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@120603 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-05Fix frame API for 1.6.0 (Closes issue #12793)tilghman1-4/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@120566 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-04Merged revisions 120514 via svnmerge from mmichelson1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r120514 | mmichelson | 2008-06-04 17:07:37 -0500 (Wed, 04 Jun 2008) | 14 lines Merged revisions 120513 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r120513 | mmichelson | 2008-06-04 17:05:33 -0500 (Wed, 04 Jun 2008) | 6 lines Make sure that the string we set will survive the unref of the queue member. Thanks to Russell, who pointed this out. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@120515 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-04Merged revisions 120286 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r120286 | mmichelson | 2008-06-04 09:12:45 -0500 (Wed, 04 Jun 2008) | 15 lines Merged revisions 120285 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r120285 | mmichelson | 2008-06-04 09:11:12 -0500 (Wed, 04 Jun 2008) | 7 lines Tab completion when removing a member should give the member's interface, not the name, since the interface is what is expected for the command. (closes issue #12783) Reported by: davevg ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@120287 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-02Merged revisions 119801 via svnmerge from russell1-0/+741
https://origsvn.digium.com/svn/asterisk/trunk ........ r119801 | russell | 2008-06-02 11:14:15 -0500 (Mon, 02 Jun 2008) | 4 lines Add app_fax from asterisk-addons, with some additional changes to resolve compiler warnings, as well as update to the APIs in spandsp 0.0.5. Spandsp 0.0.5 is being distributed under the LGPL, so we can move this module into the main tree. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@119802 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-02Merged revisions 119531 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r119531 | russell | 2008-06-01 20:04:01 -0500 (Sun, 01 Jun 2008) | 10 lines Merged revisions 119530 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r119530 | russell | 2008-06-01 20:03:22 -0500 (Sun, 01 Jun 2008) | 2 lines Fix another typo in documentation ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@119532 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-01Merged revisions 119479 via svnmerge from mvanbaak1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r119479 | mvanbaak | 2008-06-01 23:06:27 +0200 (Sun, 01 Jun 2008) | 10 lines Merged revisions 119478 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r119478 | mvanbaak | 2008-06-01 22:47:55 +0200 (Sun, 01 Jun 2008) | 2 lines small typo fix 'retires' => 'retries' ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@119529 f38db490-d61c-443f-a65b-d21fe96a405b