summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-04-29Merged revisions 114848 via svnmerge from Mark Michelson
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: https://origsvn.digium.com/svn/asterisk/trunk@114849 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-29fix this logic to actually be correct... the fd can't be *both* -1 and an ↵Kevin P. Fleming
array index to be checked in rfds/efds (bug found by gcc-4.3) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114845 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-29Make app_directory dependent on app_voicemail. This is because the functionMark Michelson
which says the person's name is handled inside app_voicemail now. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114841 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-29Since there is now a globally available function for saying someone's name, ↵Mark Michelson
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: https://origsvn.digium.com/svn/asterisk/trunk@114834 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-29Fix a crash happening in app_directory. This crash would occur if a ↵Mark Michelson
users.conf existed. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-29Merged revisions 114829 via svnmerge from Jason Parker
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: https://origsvn.digium.com/svn/asterisk/trunk@114830 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-29Merged revisions 114823 via svnmerge from Kevin P. Fleming
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: https://origsvn.digium.com/svn/asterisk/trunk@114824 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-28Adding a new option 'n' to app_chanspy. This option allows for the name of ↵Mark Michelson
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: https://origsvn.digium.com/svn/asterisk/trunk@114813 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-28Fix deadlock issue in chan_zap with libss7 due to channel variables being ↵Matthew Fredrickson
set with the channel pvt lock being held. #12512 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114776 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-28Add incomplete matching to PBX code and app_dialTilghman Lesher
(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: https://origsvn.digium.com/svn/asterisk/trunk@114773 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-28Update autoconf logic with latest API change for libss7.Joshua Colp
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114713 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-28Merged revisions 114708 via svnmerge from Tilghman Lesher
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: https://origsvn.digium.com/svn/asterisk/trunk@114709 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-28Fix breakage caused by #12028. (Closes issue #12535)Tilghman Lesher
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114706 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-27s/chan_zap/chan_skinny/Russell Bryant
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114703 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-27Make MWI in chan_skinny event based modeled after chan_zap and chan_mgcp.Michiel van Baak
(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: https://origsvn.digium.com/svn/asterisk/trunk@114700 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-27Merged revisions 114695 via svnmerge from Sean Bright
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: https://origsvn.digium.com/svn/asterisk/trunk@114696 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-26Unleak referenceTilghman Lesher
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114692 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-26Merged revisions 114689 via svnmerge from Tilghman Lesher
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: https://origsvn.digium.com/svn/asterisk/trunk@114690 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-26Add 'sip qualify peer <peer>' command (with AMI SIPqualifypeer)Tilghman Lesher
(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: https://origsvn.digium.com/svn/asterisk/trunk@114683 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25Adding a new option, 'B' to app_chanspy. This option allows the spy toMark Michelson
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: https://origsvn.digium.com/svn/asterisk/trunk@114678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25Lock the channel around datastore accessRussell Bryant
(closes issue #12527) Reported by: mnicholson Patches: pbx_lua4.diff uploaded by mnicholson (license 96) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114676 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25Merged revisions 114673 via svnmerge from Russell Bryant
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: https://origsvn.digium.com/svn/asterisk/trunk@114674 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25Whitespace changes onlyTilghman Lesher
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114667 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25Oops, this isn't necessarily AGI that is forking anymoreTilghman Lesher
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114665 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25Merged revisions 114662 via svnmerge from Mark Michelson
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: https://origsvn.digium.com/svn/asterisk/trunk@114663 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25Merge app_pickupchan with app_directed_pickup, for AST-27.Jason Parker
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: https://origsvn.digium.com/svn/asterisk/trunk@114660 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25This patch allows for forwarding a message with a "comment" attachmentMark Michelson
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: https://origsvn.digium.com/svn/asterisk/trunk@114656 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25Merge code from team/russell/parking_updatesRussell Bryant
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: https://origsvn.digium.com/svn/asterisk/trunk@114655 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25Fix a memory leak and protect against potential dereferences of a NULLMark Michelson
pointer. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114651 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25Blocked revisions 114649 via svnmergeTilghman Lesher
........ 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: https://origsvn.digium.com/svn/asterisk/trunk@114650 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25Speaking of building...Sean Bright
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114644 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24Pass the hangup cause all the way to the calling app/channel.Michiel van Baak
(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: https://origsvn.digium.com/svn/asterisk/trunk@114637 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24Hey look, it builds.Joshua Colp
(closes issue #12519) Reported by: falves11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114635 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24Merged revisions 114632 via svnmerge from Mark Michelson
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: https://origsvn.digium.com/svn/asterisk/trunk@114633 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24Merged revisions 114628 via svnmerge from Mark Michelson
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: https://origsvn.digium.com/svn/asterisk/trunk@114629 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24Merged revisions 114624 via svnmerge from Mark Michelson
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: https://origsvn.digium.com/svn/asterisk/trunk@114625 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24Merged revisions 114621 via svnmerge from Tilghman Lesher
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: https://origsvn.digium.com/svn/asterisk/trunk@114622 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24Fix DST calculation, and fix bug in calculation of whether conf has started ↵Tilghman Lesher
yet or not (Closes issue #12292) Reported by: DEA Patches: app_meetme-rt-dst-sched-fix.txt uploaded by DEA (license 3) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114617 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24Merged revisions 51989 via svnmerge from Jason Parker
https://origsvn.digium.com/svn/asterisk/branches/1.4 (closes issue #12496) Reported by: daniele Patches: misdn-moh-1.6.0-beta7.1.patch uploaded by daniele (license 471) Tested by: daniele Technically, I didn't use the patch above except to find out what revision to merge - but it's the same thing as this revision. ........ r51989 | crichter | 2007-01-24 06:57:22 -0600 (Wed, 24 Jan 2007) | 1 line added fix from #8899 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114612 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24Merged revisions 114608 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114608 | russell | 2008-04-24 10:55:21 -0500 (Thu, 24 Apr 2008) | 4 lines Fix a silly mistake in a change I made yesterday that caused chan_iax2 to blow up very quickly. (issue #12515) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114609 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24Merged revisions 114603 via svnmerge from Olle Johansson
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114603 | oej | 2008-04-24 16:55:18 +0200 (Tor, 24 Apr 2008) | 3 lines Only have one max-forwards header in outbound REFERs. Discovered in the Asterisk SIP Masterclass in Orlando. Thanks Joe! ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114606 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24Change a verbose message to debug.Russell Bryant
(closes issue #12514) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114604 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-23Merged revisions 114600 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114600 | russell | 2008-04-23 17:18:12 -0500 (Wed, 23 Apr 2008) | 6 lines Improve some broken cookie parsing code. Previously, manager login over HTTP would only work if the mansession_id cookie was first. Now, the code builds a list of all of the cookies in the Cookie header. This fixes a problem observed by users of the Asterisk GUI. (closes AST-20) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114601 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-23Merged revisions 114597 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114597 | russell | 2008-04-23 15:49:18 -0500 (Wed, 23 Apr 2008) | 10 lines Fix an issue that caused getting the correct next channel to not always work. Also, remove setting the amount of time to wait for a digit from 5 seconds back down to 1/10 of a second. I believe this was so the beep didn't get played over and over really fast, but a while back I put in another fix for that issue. (closes issue #12498) Reported by: jsmith Patches: app_chanspy_channel_walk.trunk.patch uploaded by jsmith (license 15) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114598 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-23Merged revisions 114594 via svnmerge from Jason Parker
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114594 | qwell | 2008-04-23 13:28:44 -0500 (Wed, 23 Apr 2008) | 8 lines Fix reload/unload for res_musiconhold module. (closes issue #11575) Reported by: sunder Patches: M11575_14_rev3.diff uploaded by junky (license 177) bug11575_trunk.diff.txt uploaded by jamesgolovich (license 176) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114595 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-23Merged revisions 114591 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114591 | russell | 2008-04-23 12:55:31 -0500 (Wed, 23 Apr 2008) | 5 lines Store the manager session ID explicitly as 4 byte ID instead of a ulong. The mansession_id cookie is coded to be limited to 8 characters of hex, and this could break logins from 64-bit machines in some cases. (inspired by AST-20) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114592 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-23Merged revisions 114587 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114587 | russell | 2008-04-23 12:16:32 -0500 (Wed, 23 Apr 2008) | 2 lines Fix find_callno_locked() to actually return the callno locked in some more cases. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114588 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-23Merged revisions 114584 via svnmerge from Olle Johansson
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114584 | oej | 2008-04-23 18:51:41 +0200 (Ons, 23 Apr 2008) | 2 lines Add 502 support for both directions, not only one... (see r114571) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114585 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-23Merged revisions 114579 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114579 | file | 2008-04-23 11:54:11 -0300 (Wed, 23 Apr 2008) | 4 lines Instead of stopping dialplan execution when SayNumber attempts to say a large number that it can not print out a message informing the user and continue on. (closes issue #12502) Reported by: bcnit ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114580 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-23Round 2 of IMAP_STORAGE app_voicemail.c fixes:Mark Michelson
This fixes a bug that was thought to be fixed already. app_voicemail, if using IMAP_STORAGE, has a problem because the IMAP header files include syslog.h, which define LOG_WARNING and LOG_DEBUG to be different than what Asterisk uses for those same macros. This was "fixed" in the past by including all the IMAP header files prior to including asterisk.h. This fix worked... unless you were to try to compile with MALLOC_DEBUG. MALLOC_DEBUG prepends the inclusion of astmm.h to every file, which means that no matter what order the includes are in in app_voicemail, the unexpected values for LOG_WARNING and LOG_DEBUG will be in place. The action taken for this fix was to define AST_LOG_* macros in addition to the LOG_* macros already defined. These new macros are used in app_voicemail.c, logger.h, and astobj.h right now, and their use will be encouraged in the future. In consideration of those who have written third-party modules which use the LOG_* macros, these will NOT be removed from the source, however future use of these macros is discouraged. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114577 65c4cc65-6c06-0410-ace0-fbb531ad65f3