Commit Graph

15315 Commits

Author SHA1 Message Date
Jeff Peeler
d868e4643c Merged revisions 114866 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114867 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-29 22:55:13 +00:00
Mark Michelson
a4bfe4880e Blocked revisions 114857 via svnmerge
........
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114858 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-29 21:09:07 +00:00
Mark Michelson
ec4819f368 Merged revisions 114849 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114850 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-29 19:42:43 +00:00
Kevin P. Fleming
d5b5113743 bug is not present in this branch
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114846 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-29 19:04:09 +00:00
Mark Michelson
75bb9a755a Blocked revisions 114841 via svnmerge
........
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114843 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-29 18:49:38 +00:00
Mark Michelson
b47f8fc35d Blocked revisions 114834 via svnmerge
........
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114835 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-29 17:56:37 +00:00
Mark Michelson
a78efc7fcd Blocked revisions 114832 via svnmerge
........
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114833 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-29 17:32:41 +00:00
Jason Parker
fff476985f Merged revisions 114830 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114831 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-29 17:11:57 +00:00
Kevin P. Fleming
3df627a0fd Merged revisions 114824 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114825 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-29 12:55:39 +00:00
Mark Michelson
88645b3b3a Blocked revisions 114813 via svnmerge
........
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114814 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-28 22:39:55 +00:00
Matthew Fredrickson
d27eb35d56 Merged revisions 114776 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114777 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-28 17:04:23 +00:00
Tilghman Lesher
392c610211 Blocked revisions 114773 via svnmerge
........
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114774 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-28 16:39:34 +00:00
Joshua Colp
39767a7948 Merged revisions 114713 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114714 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-28 13:44:24 +00:00
Tilghman Lesher
4ab60760e3 Merged revisions 114709 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114710 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-28 04:54:13 +00:00
Tilghman Lesher
32ec7da129 Blocked revisions 114706 via svnmerge
........
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114707 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-28 04:32:44 +00:00
Michiel van Baak
ba2d863314 Merged revisions 114700 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114701 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-27 15:20:45 +00:00
Sean Bright
ae5149f4fe Merged revisions 114696 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114697 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-27 01:30:44 +00:00
Tilghman Lesher
cec3fba722 Blocked revisions 114692 via svnmerge
........
r114692 | tilghman | 2008-04-26 10:08:51 -0500 (Sat, 26 Apr 2008) | 2 lines

Unleak reference

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114693 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-26 15:09:31 +00:00
Tilghman Lesher
d3a72a96af Merged revisions 114690 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114691 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-26 13:18:20 +00:00
Tilghman Lesher
238df44b01 Blocked revisions 114683 via svnmerge
........
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114684 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-26 02:49:54 +00:00
Mark Michelson
0ef5d9d15b Blocked revisions 114678 via svnmerge
........
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25 22:25:48 +00:00
Russell Bryant
49ba484a53 Merged revisions 114676 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114677 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25 22:05:26 +00:00
Russell Bryant
35c3c7770f Merged revisions 114674 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25 22:03:25 +00:00
Russell Bryant
583b8b1cb8 Blocked revisions 114650 via svnmerge
................
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114672 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25 21:46:36 +00:00
Russell Bryant
c9fdb8cd09 Blocked revisions 114655 via svnmerge
........
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114671 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25 21:46:11 +00:00
Tilghman Lesher
09c3e0f618 Blocked revisions 114667 via svnmerge
........
r114667 | tilghman | 2008-04-25 15:20:10 -0500 (Fri, 25 Apr 2008) | 2 lines

Whitespace changes only

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114668 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25 20:20:54 +00:00
Tilghman Lesher
27ef21d404 Blocked revisions 114665 via svnmerge
........
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114666 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25 19:40:20 +00:00
Mark Michelson
070497048a Merged revisions 114663 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114664 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25 19:34:11 +00:00
Jason Parker
bfdca9e0f2 Blocked revisions 114660 via svnmerge
........
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114661 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25 19:09:08 +00:00
Mark Michelson
4a927adba5 Blocked revisions 114656 via svnmerge
........
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114658 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25 18:20:01 +00:00
Russell Bryant
326c20838b Blocked revisions 114655 via svnmerge
........
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114657 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25 18:19:24 +00:00
Mark Michelson
c2f8b21868 Merged revisions 114651 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114652 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25 16:26:08 +00:00
Sean Bright
f35b986bfd Blocked revisions 114644 via svnmerge
........
r114644 | seanbright | 2008-04-25 09:56:05 -0400 (Fri, 25 Apr 2008) | 1 line

Speaking of building...
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114645 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-25 13:56:57 +00:00
Michiel van Baak
72bad89c93 Blocked revisions 114637 via svnmerge
........
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114638 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24 22:18:58 +00:00
Joshua Colp
7b66e9fcb5 Merged revisions 114635 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114636 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24 22:14:03 +00:00
Mark Michelson
6f5321c1bf Merged revisions 114633 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114634 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24 21:36:05 +00:00
Mark Michelson
9ebf88ab3d Merged revisions 114629 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114630 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24 20:44:37 +00:00
Mark Michelson
0b3951288d Merged revisions 114625 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114626 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24 20:06:38 +00:00
Tilghman Lesher
a48962b43d Merged revisions 114622 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114623 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24 19:55:55 +00:00
Tilghman Lesher
b4a9866bd5 Merged revisions 114617 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r114617 | tilghman | 2008-04-24 14:24:31 -0500 (Thu, 24 Apr 2008) | 6 lines

Fix DST calculation, and fix bug in calculation of whether conf has started 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/branches/1.6.0@114619 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24 19:37:45 +00:00
Jason Parker
9668fba027 Merged revisions 114612 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r114612 | qwell | 2008-04-24 11:47:01 -0500 (Thu, 24 Apr 2008) | 17 lines

Merged revisions 51989 via svnmerge from 
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/branches/1.6.0@114613 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24 16:48:05 +00:00
Russell Bryant
7f3b41e6b3 Merged revisions 114609 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r114609 | russell | 2008-04-24 10:56:55 -0500 (Thu, 24 Apr 2008) | 12 lines

Merged revisions 114608 via svnmerge from 
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/branches/1.6.0@114610 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24 15:57:24 +00:00
Olle Johansson
d6cf0c7823 Merged revisions 114606 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r114606 | oej | 2008-04-24 16:59:05 +0200 (Tor, 24 Apr 2008) | 11 lines

Merged revisions 114603 via svnmerge from 
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/branches/1.6.0@114607 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24 15:00:50 +00:00
Russell Bryant
d8234a6f34 Merged revisions 114604 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r114604 | russell | 2008-04-24 09:55:21 -0500 (Thu, 24 Apr 2008) | 3 lines

Change a verbose message to debug.
(closes issue #12514)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114605 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24 14:56:44 +00:00
Russell Bryant
25eca96f81 Merged revisions 114601 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r114601 | russell | 2008-04-23 17:53:20 -0500 (Wed, 23 Apr 2008) | 14 lines

Merged revisions 114600 via svnmerge from 
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/branches/1.6.0@114602 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-23 22:54:41 +00:00
Russell Bryant
e5c15bef2a Merged revisions 114598 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r114598 | russell | 2008-04-23 15:53:05 -0500 (Wed, 23 Apr 2008) | 18 lines

Merged revisions 114597 via svnmerge from 
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/branches/1.6.0@114599 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-23 20:53:27 +00:00
Jason Parker
9b9c0983eb Merged revisions 114595 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r114595 | qwell | 2008-04-23 13:33:28 -0500 (Wed, 23 Apr 2008) | 16 lines

Merged revisions 114594 via svnmerge from 
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/branches/1.6.0@114596 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-23 18:34:50 +00:00
Russell Bryant
94dddcf2a8 Merged revisions 114592 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r114592 | russell | 2008-04-23 13:01:00 -0500 (Wed, 23 Apr 2008) | 13 lines

Merged revisions 114591 via svnmerge from 
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/branches/1.6.0@114593 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-23 18:01:42 +00:00
Russell Bryant
1b3ee9e4f0 Merged revisions 114588 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r114588 | russell | 2008-04-23 12:18:29 -0500 (Wed, 23 Apr 2008) | 10 lines

Merged revisions 114587 via svnmerge from 
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/branches/1.6.0@114589 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-23 17:18:59 +00:00
Olle Johansson
3435ef6663 Merged revisions 114585 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r114585 | oej | 2008-04-23 18:53:34 +0200 (Ons, 23 Apr 2008) | 10 lines

Merged revisions 114584 via svnmerge from 
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/branches/1.6.0@114586 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-23 16:57:28 +00:00