aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2008-05-01Merged revisions 114922 via svnmerge from qwell1-10/+9
https://origsvn.digium.com/svn/asterisk/trunk ........ r114922 | qwell | 2008-05-01 11:49:24 -0500 (Thu, 01 May 2008) | 10 lines Allow dringXrange to properly default to 10, as was done in 1.4. dringXrange is a new feature that was added, and it attempted to default, but only when the option was specified. (closes issue #12536) Reported by: bjm Patches: 12536-dringXrange.diff uploaded by qwell (license 4) Tested by: bjm ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114923 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-30Blocked revisions 114912 via svnmergefile0-0/+0
........ r114912 | file | 2008-04-30 17:51:17 -0300 (Wed, 30 Apr 2008) | 2 lines Add support for specifying the registration expiry on a per registration basis in the register line. This comes from a Switchvox patch. (issue AST-24) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114913 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-30Add the dlinkedlists implementation from trunkrussell1-0/+974
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114909 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-30Make 1.6.0 compilemmichelson1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114908 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-30Blocked revisions 114906 via svnmergemmichelson0-0/+0
........ r114906 | mmichelson | 2008-04-30 14:30:41 -0500 (Wed, 30 Apr 2008) | 12 lines Adding new configuration options to app_queue. This adds two new values to announce-position, "limit" and "more," as well as a new option, announce-position-limit. For more information on the use of these options, see CHANGES or configs/queues.conf.sample. (closes issue #10991) Reported by: slavon Patches: app_q.diff uploaded by slavon (license 288) Tested by: slavon, putnopvut ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114907 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-30Blocked revisions 114904 via svnmergetilghman0-0/+0
........ r114904 | tilghman | 2008-04-30 14:21:04 -0500 (Wed, 30 Apr 2008) | 8 lines Lock around variables retrieved, and copy the values, if they stay persistent, since another thread could remove them. (closes issue #12541) Reported by: snuffy Patches: bug_12156_apps.diff uploaded by snuffy (license 35) Several additional changes by me ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114905 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-30Merged revisions 114899 via svnmerge from oej1-4/+8
https://origsvn.digium.com/svn/asterisk/trunk ................ r114899 | oej | 2008-04-30 18:55:49 +0200 (Ons, 30 Apr 2008) | 15 lines Merged revisions 114890 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114890 | oej | 2008-04-30 18:23:17 +0200 (Ons, 30 Apr 2008) | 7 lines Don't crash on bad SIP replys. Fix created in Huntsville together with Mark M (putnopvut) (closes issue #12363) Reported by: jvandal Tested by: putnopvut, oej ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114900 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-30Merged revisions 114892 via svnmerge from russell2-66/+191
https://origsvn.digium.com/svn/asterisk/trunk ................ r114892 | russell | 2008-04-30 11:34:24 -0500 (Wed, 30 Apr 2008) | 36 lines Merged revisions 114891 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114891 | russell | 2008-04-30 11:30:01 -0500 (Wed, 30 Apr 2008) | 28 lines Merge changes from team/russell/iax2_find_callno and iax2_find_callno_1.4 These changes address a critical performance issue introduced in the latest release. The fix for the latest security issue included a change that made Asterisk randomly choose call numbers to make them more difficult to guess by attackers. However, due to some inefficient (this is by far, an understatement) code, when Asterisk chose high call numbers, chan_iax2 became unusable after just a small number of calls. On a small embedded platform, it would not be able to handle a single call. On my Intel Core 2 Duo @ 2.33 GHz, I couldn't run more than about 16 IAX2 channels. Ouch. These changes address some performance issues of the find_callno() function that have bothered me for a very long time. On every incoming media frame, it iterated through every possible call number trying to find a matching active call. This involved a mutex lock and unlock for each call number checked. So, if the random call number chosen was 20000, then every media frame would cause 20000 locks and unlocks. Previously, this problem was not as obvious since Asterisk always chose the lowest call number it could. A second container for IAX2 pvt structs has been added. It is an astobj2 hash table. When we know the remote side's call number, the pvt goes into the hash table with a hash value of the remote side's call number. Then, lookups for incoming media frames are a very fast hash lookup instead of an absolutely insane array traversal. In a quick test, I was able to get more than 3600% more IAX2 channels on my machine with these changes. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114893 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-30Merged revisions 114888 via svnmerge from jpeeler1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r114888 | jpeeler | 2008-04-30 11:14:43 -0500 (Wed, 30 Apr 2008) | 3 lines Fixes a bug where if a stream monitor thread was not created (caused from failure of opening or starting the stream) pthread_cancel was called with an invalid thread ID. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114889 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-30Merged revisions 114884 via svnmerge from kpfleming2-18/+32
https://origsvn.digium.com/svn/asterisk/trunk ................ r114884 | kpfleming | 2008-04-30 09:49:51 -0500 (Wed, 30 Apr 2008) | 10 lines Merged revisions 114880 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114880 | kpfleming | 2008-04-30 09:46:57 -0500 (Wed, 30 Apr 2008) | 2 lines use the ARRAY_LEN macro for indexing through the iaxs/iaxsl arrays so that the size of the arrays can be adjusted in one place, and change the size of the arrays from 32768 calls to 2048 calls when LOW_MEMORY is defined ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114886 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-30Merged revisions 114876 via svnmerge from kpfleming1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r114876 | kpfleming | 2008-04-30 07:15:43 -0500 (Wed, 30 Apr 2008) | 10 lines Merged revisions 114875 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114875 | kpfleming | 2008-04-30 07:14:07 -0500 (Wed, 30 Apr 2008) | 2 lines pay attention to *all* header files for dependency tracking, not just the local ones (inspired by r578 of asterisk-addons by tilghman) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114877 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-29Merged revisions 114866 via svnmerge from jpeeler1-6/+8
https://origsvn.digium.com/svn/asterisk/trunk ........ r114866 | jpeeler | 2008-04-29 17:54:14 -0500 (Tue, 29 Apr 2008) | 2 lines Fixes a problem where all the templates were marked as dead no matter what. The templates should only be marked as dead if a configuration file has been successfully loaded and has changes. Bug found while making API documentation for 1.6.0. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114867 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-29Blocked revisions 114857 via svnmergemmichelson0-0/+0
........ r114857 | mmichelson | 2008-04-29 16:07:36 -0500 (Tue, 29 Apr 2008) | 15 lines Patching app_chanspy to jibe better with what is documented. This allows for a colon-delimited list of spygroups to be specified when calling the ChanSpy application with the 'g' option. Prior to this, you could only specify a single group when using the 'g' option. I also have upped the maximum number of spygroups to 128 and added a #define so that this can be easily increased or decreased later. (closes issue #12497) Reported by: jsmith Patches: app_chanspy_multiple_groups_v2.patch uploaded by jsmith (license 15) Tested by: atis, jvandal ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114858 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-29Merged revisions 114849 via svnmerge from mmichelson1-4/+9
https://origsvn.digium.com/svn/asterisk/trunk ................ r114849 | mmichelson | 2008-04-29 14:42:04 -0500 (Tue, 29 Apr 2008) | 22 lines Merged revisions 114848 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114848 | mmichelson | 2008-04-29 14:40:06 -0500 (Tue, 29 Apr 2008) | 14 lines Use the MACRO_CONTEXT and MACRO_EXTEN channel variables instead of the channel's macrocontext and macroexten fields. This is needed because if macros are daisy-chained, the incorrect context and extension are placed on the new channel. I also added locking to the channel prior to accessing these variables as noted in trunk's janitor project file. (closes issue #12549) Reported by: darren1713 Patches: app_queue.c.macroextenpatch uploaded by darren1713 (license 116) (with modifications from me) Tested by: putnopvut ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114850 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-29bug is not present in this branchkpfleming0-0/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114846 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-29Blocked revisions 114841 via svnmergemmichelson0-0/+0
........ r114841 | mmichelson | 2008-04-29 13:48:26 -0500 (Tue, 29 Apr 2008) | 4 lines Make app_directory dependent on app_voicemail. This is because the function which says the person's name is handled inside app_voicemail now. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114843 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-29Blocked revisions 114834 via svnmergemmichelson0-0/+0
........ r114834 | mmichelson | 2008-04-29 12:56:13 -0500 (Tue, 29 Apr 2008) | 8 lines Since there is now a globally available function for saying someone's name, a LOT of functions in app_directory can be removed since the ODBC-specific lookups are accomplished within app_voicemail. This change greatly reduces the amount of lines in app_directory that were solely for the purpose of looking up a name when ODBC_STORAGE is specified for voicemail. This commit also makes the name-saying interruptable via DTMF. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114835 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-29Blocked revisions 114832 via svnmergemmichelson0-0/+0
........ r114832 | mmichelson | 2008-04-29 12:31:26 -0500 (Tue, 29 Apr 2008) | 3 lines Fix a crash happening in app_directory. This crash would occur if a users.conf existed. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114833 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-29Merged revisions 114830 via svnmerge from qwell1-2/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r114830 | qwell | 2008-04-29 12:10:55 -0500 (Tue, 29 Apr 2008) | 9 lines Merged revisions 114829 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114829 | qwell | 2008-04-29 12:08:55 -0500 (Tue, 29 Apr 2008) | 1 line Change warning message to debug, since there are cases where 0 results is perfectly fine. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114831 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-29Merged revisions 114824 via svnmerge from kpfleming1-0/+11
https://origsvn.digium.com/svn/asterisk/trunk ................ r114824 | kpfleming | 2008-04-29 07:54:31 -0500 (Tue, 29 Apr 2008) | 18 lines Merged revisions 114823 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r114823 | kpfleming | 2008-04-29 07:53:12 -0500 (Tue, 29 Apr 2008) | 10 lines Merged revisions 114822 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r114822 | kpfleming | 2008-04-29 07:52:32 -0500 (Tue, 29 Apr 2008) | 2 lines stop script from appending source code if run multiple times ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114825 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-28Blocked revisions 114813 via svnmergemmichelson0-0/+0
........ r114813 | mmichelson | 2008-04-28 17:38:07 -0500 (Mon, 28 Apr 2008) | 10 lines Adding a new option 'n' to app_chanspy. This option allows for the name of the spied-on party to be spoken instead of the channel name or number. This was accomplished by adding a new function pointer to point to a function in app_voicemail which retrieves the name file and plays it. This makes for an easy way that applications may play a user's name should it be necessary. app_directory, in particular, can be simplified greatly by this change. This change comes as a suggestion from Switchvox, which already has this feature. AST-23 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114814 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-28Merged revisions 114776 via svnmerge from mattf1-1/+11
https://origsvn.digium.com/svn/asterisk/trunk ........ r114776 | mattf | 2008-04-28 12:00:38 -0500 (Mon, 28 Apr 2008) | 1 line Fix deadlock issue in chan_zap with libss7 due to channel variables being set with the channel pvt lock being held. #12512 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114777 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-28Blocked revisions 114773 via svnmergetilghman0-0/+0
........ r114773 | tilghman | 2008-04-28 11:37:45 -0500 (Mon, 28 Apr 2008) | 8 lines Add incomplete matching to PBX code and app_dial (closes issue #12351) Reported by: Corydon76 Patches: 20080402__pbx_incomplete__3.diff.txt uploaded by Corydon76 (license 14) pbx_incomplete_with_timeout.diff uploaded by fabled (license 448) Tested by: Corydon76, fabled ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114774 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-28Merged revisions 114713 via svnmerge from file2-7/+11
https://origsvn.digium.com/svn/asterisk/trunk ........ r114713 | file | 2008-04-28 10:42:13 -0300 (Mon, 28 Apr 2008) | 2 lines Update autoconf logic with latest API change for libss7. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114714 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-28Merged revisions 114709 via svnmerge from tilghman2-4/+14
https://origsvn.digium.com/svn/asterisk/trunk ................ r114709 | tilghman | 2008-04-27 23:53:20 -0500 (Sun, 27 Apr 2008) | 13 lines Merged revisions 114708 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114708 | tilghman | 2008-04-27 23:47:39 -0500 (Sun, 27 Apr 2008) | 5 lines When modules are embedded, they take on a different name, without the ".so" extension. Specifically check for this name, when we're checking if a module is loaded. (Closes issue #12534) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114710 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-28Blocked revisions 114706 via svnmergetilghman0-0/+0
........ r114706 | tilghman | 2008-04-27 23:30:02 -0500 (Sun, 27 Apr 2008) | 2 lines Fix breakage caused by #12028. (Closes issue #12535) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114707 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-27Merged revisions 114700 via svnmerge from mvanbaak1-6/+47
https://origsvn.digium.com/svn/asterisk/trunk Merged to 1.6 because it fixes a crash. ........ r114700 | mvanbaak | 2008-04-27 17:17:18 +0200 (Sun, 27 Apr 2008) | 8 lines Make MWI in chan_skinny event based modeled after chan_zap and chan_mgcp. (closes issue #12214) Reported by: DEA Patches: chan_skinny-vm-events-v3.txt uploaded by DEA (license 3) Tested by: DEA and me ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114701 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-27Merged revisions 114696 via svnmerge from seanbright2-14/+30
https://origsvn.digium.com/svn/asterisk/trunk ................ r114696 | seanbright | 2008-04-26 21:28:32 -0400 (Sat, 26 Apr 2008) | 13 lines Merged revisions 114695 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114695 | seanbright | 2008-04-26 21:26:15 -0400 (Sat, 26 Apr 2008) | 5 lines When we don't explicitly pass a path to the --with-tds configure option, we may end up finding tds.h in /usr/local/include instead of /usr/include. If this happens, the grep that looks for the version (from tdsver.h) will fail and we'll have some problems during the build. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114697 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-26Blocked revisions 114692 via svnmergetilghman0-0/+0
........ r114692 | tilghman | 2008-04-26 10:08:51 -0500 (Sat, 26 Apr 2008) | 2 lines Unleak reference ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114693 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-26Merged revisions 114690 via svnmerge from tilghman1-130/+138
https://origsvn.digium.com/svn/asterisk/trunk ................ r114690 | tilghman | 2008-04-26 08:17:19 -0500 (Sat, 26 Apr 2008) | 14 lines Merged revisions 114689 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114689 | tilghman | 2008-04-26 08:15:21 -0500 (Sat, 26 Apr 2008) | 6 lines Clicking forward without selecting a message leaves an errant .lock file. (closes issue #12528) Reported by: pukepail Patches: patch.diff uploaded by pukepail (license 431) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114691 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-26Blocked revisions 114683 via svnmergetilghman0-0/+0
........ r114683 | tilghman | 2008-04-25 21:48:56 -0500 (Fri, 25 Apr 2008) | 8 lines Add 'sip qualify peer <peer>' command (with AMI SIPqualifypeer) (closes issue #12524) Reported by: ctooley Patches: sip_qualify_peer.diff.2 uploaded by ctooley (license 136) some modifications for trunk by Corydon76 Tested by: Corydon76 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114684 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-25Blocked revisions 114678 via svnmergemmichelson0-0/+0
........ r114678 | mmichelson | 2008-04-25 17:24:32 -0500 (Fri, 25 Apr 2008) | 11 lines Adding a new option, 'B' to app_chanspy. This option allows the spy to barge on the call. It is like the existing whisper option, except that it allows the spy to talk to both sides of the conversation on which he is spying. This feature has existed in Switchvox, and this merges the functionality into Asterisk. (AST-32) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114680 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-25Merged revisions 114676 via svnmerge from russell1-0/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r114676 | russell | 2008-04-25 17:04:46 -0500 (Fri, 25 Apr 2008) | 7 lines Lock the channel around datastore access (closes issue #12527) Reported by: mnicholson Patches: pbx_lua4.diff uploaded by mnicholson (license 96) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114677 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-25Merged revisions 114674 via svnmerge from russell1-5/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r114674 | russell | 2008-04-25 17:00:35 -0500 (Fri, 25 Apr 2008) | 11 lines Merged revisions 114673 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114673 | russell | 2008-04-25 16:54:40 -0500 (Fri, 25 Apr 2008) | 3 lines Use consistent logic for checking to see if a call number has been chosen yet. Also, remove some redundant logic I recently added in a fix. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114675 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-25Blocked revisions 114650 via svnmergerussell0-0/+0
................ r114650 | tilghman | 2008-04-25 10:58:36 -0500 (Fri, 25 Apr 2008) | 13 lines Blocked revisions 114649 via svnmerge ........ r114649 | tilghman | 2008-04-25 10:53:52 -0500 (Fri, 25 Apr 2008) | 6 lines Reference documentation files that actually exist. (closes issue #12516) Reported by: linuxmaniac Patches: diff_rev114611.patch uploaded by linuxmaniac (license 472) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114672 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-25Blocked revisions 114655 via svnmergerussell0-0/+0
........ r114655 | russell | 2008-04-25 13:18:27 -0500 (Fri, 25 Apr 2008) | 10 lines Merge code from team/russell/parking_updates Add some additional features to the core park_call_full() function, and expose them as options to the Park() application. The functionality being added is the ability to specify a custom return extension/context/priority, a custom timeout, and a couple of options. The options are to play ringing instead of MOH to the parked caller, and to randomize parking spot selection. (code inspired by the patch in AST-17, code from switchvox) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114671 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-25Blocked revisions 114667 via svnmergetilghman0-0/+0
........ r114667 | tilghman | 2008-04-25 15:20:10 -0500 (Fri, 25 Apr 2008) | 2 lines Whitespace changes only ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114668 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-25Blocked revisions 114665 via svnmergetilghman0-0/+0
........ r114665 | tilghman | 2008-04-25 14:39:26 -0500 (Fri, 25 Apr 2008) | 2 lines Oops, this isn't necessarily AGI that is forking anymore ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114666 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-25Merged revisions 114663 via svnmerge from mmichelson1-7/+6
https://origsvn.digium.com/svn/asterisk/trunk ................ r114663 | mmichelson | 2008-04-25 14:33:27 -0500 (Fri, 25 Apr 2008) | 12 lines Merged revisions 114662 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114662 | mmichelson | 2008-04-25 14:32:02 -0500 (Fri, 25 Apr 2008) | 4 lines Move the unlock of the spyee channel to outside the start_spying() function so that the channel is not unlocked twice when using whisper mode. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114664 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-25Blocked revisions 114660 via svnmergeqwell0-0/+0
........ r114660 | qwell | 2008-04-25 13:32:22 -0500 (Fri, 25 Apr 2008) | 12 lines Merge app_pickupchan with app_directed_pickup, for AST-27. Initially, this was to be a new feature, with a patch from Switchvox, but after discussions, it was noted that this feature already existed in trunk. The resulting discussions ended in a comment that was along the lines of "the patch provided here is a lot smaller than what is already in trunk, because it doesn't create a new application and duplicate existing code" It was decided that these two applications could be easily merged to reduce code duplication. SO, that's what this does. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114661 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-25Blocked revisions 114656 via svnmergemmichelson0-0/+0
........ r114656 | mmichelson | 2008-04-25 13:18:30 -0500 (Fri, 25 Apr 2008) | 13 lines This patch allows for forwarding a message with a "comment" attachment if using IMAP storage for voicemail. The comment will be recorded and attached as a second attachment in addition to the original message. This will be invoked if you choose to prepend a message the way you would with file or ODBC storage (closes issue #12028) Reported by: jaroth Patches: forward_with_comment_v2.patch uploaded by jaroth (license 50) Tested by: jaroth ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114658 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-25Blocked revisions 114655 via svnmergerussell0-0/+0
........ r114655 | russell | 2008-04-25 13:18:27 -0500 (Fri, 25 Apr 2008) | 10 lines Merge code from team/russell/parking_updates Add some additional features to the core park_call_full() function, and expose them as options to the Park() application. The functionality being added is the ability to specify a custom return extension/context/priority, a custom timeout, and a couple of options. The options are to play ringing instead of MOH to the parked caller, and to randomize parking spot selection. (code inspired by the patch in AST-17, code from switchvox) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114657 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-25Merged revisions 114651 via svnmerge from mmichelson1-6/+7
https://origsvn.digium.com/svn/asterisk/trunk ........ r114651 | mmichelson | 2008-04-25 11:25:17 -0500 (Fri, 25 Apr 2008) | 4 lines Fix a memory leak and protect against potential dereferences of a NULL pointer. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114652 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-25Blocked revisions 114644 via svnmergeseanbright0-0/+0
........ r114644 | seanbright | 2008-04-25 09:56:05 -0400 (Fri, 25 Apr 2008) | 1 line Speaking of building... ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114645 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-24Blocked revisions 114637 via svnmergemvanbaak0-0/+0
........ r114637 | mvanbaak | 2008-04-25 00:16:48 +0200 (Fri, 25 Apr 2008) | 8 lines Pass the hangup cause all the way to the calling app/channel. (closes issue #11328) Reported by: rain Patches: 20071207__pass_cause_in_hangup_control_frame.diff.txt uploaded by Corydon76 (license 14) brought up-to-date to trunk by me ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114638 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-24Merged revisions 114635 via svnmerge from file1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r114635 | file | 2008-04-24 19:11:46 -0300 (Thu, 24 Apr 2008) | 4 lines Hey look, it builds. (closes issue #12519) Reported by: falves11 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114636 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-24Merged revisions 114633 via svnmerge from mmichelson1-0/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r114633 | mmichelson | 2008-04-24 16:35:39 -0500 (Thu, 24 Apr 2008) | 19 lines Merged revisions 114632 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114632 | mmichelson | 2008-04-24 16:35:08 -0500 (Thu, 24 Apr 2008) | 11 lines Re-invite RTP during a masquerade so that, for instance, an AMI redirect of two channels which are natively bridged will preserve audio on both channels. This prevents a problem with Asterisk not re-inviting due to one of the channels having being a zombie. (closes issue #12513) Reported by: mneuhauser Patches: asterisk-1.4-114602_restore-RTP-on-fixup.patch uploaded by mneuhauser (license 425) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114634 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-24Merged revisions 114629 via svnmerge from mmichelson1-4/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r114629 | mmichelson | 2008-04-24 15:43:52 -0500 (Thu, 24 Apr 2008) | 16 lines Merged revisions 114628 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114628 | mmichelson | 2008-04-24 15:43:03 -0500 (Thu, 24 Apr 2008) | 8 lines Output of channel variables when eventwhencalled=vars was set was being truncated two characters. This patch corrects the problem. (closes issue #12493) Reported by: davidw ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114630 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-24Merged revisions 114625 via svnmerge from mmichelson1-0/+6
https://origsvn.digium.com/svn/asterisk/trunk ................ r114625 | mmichelson | 2008-04-24 15:06:06 -0500 (Thu, 24 Apr 2008) | 18 lines Merged revisions 114624 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114624 | mmichelson | 2008-04-24 15:04:24 -0500 (Thu, 24 Apr 2008) | 10 lines Resolve a deadlock in chan_local by releasing the channel lock temporarily. (closes issue #11712) Reported by: callguy Patches: 11712.patch uploaded by putnopvut (license 60) Tested by: acunningham ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114626 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-24Merged revisions 114622 via svnmerge from tilghman1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r114622 | tilghman | 2008-04-24 14:54:57 -0500 (Thu, 24 Apr 2008) | 12 lines Merged revisions 114621 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114621 | tilghman | 2008-04-24 14:53:36 -0500 (Thu, 24 Apr 2008) | 4 lines Ensure that when we set the accountcode, it actually shows up in the CDR. (Fix for AMI Originate) (Closes issue #12007) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114623 f38db490-d61c-443f-a65b-d21fe96a405b