Mark Michelson c48b43e2d8 Merged revisions 99426 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r99426 | mmichelson | 2008-01-21 17:55:26 -0600 (Mon, 21 Jan 2008) | 12 lines

Fixing an issue wherein monitoring local channels was not possible. During a channel
masquerade, the monitors on the two channels involved are swapped. In 99% of the cases
this results in the desired effect. However, if monitoring a local channel, this caused
the monitor which was on the local channel to get moved onto a channel which is immediately
hung up after the masquerade has completed. By swapping the monitors prior to the masquerade, 
we avoid the problem by tricking the masquerade into placing the monitor back onto the channel
where we want it.

During the investigation of the issue, the channel's monitor was the only thing that was swapped
in such a manner which did not make sense to have done. All other variable swapping made sense.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@99427 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2008-01-21 23:56:40 +00:00

..

h323

Include the compatibility header file in ast_h323.cxx for compatibility reasons.

2007-11-20 14:49:32 +00:00

misdn

Doxygen updates, formatting.

2007-12-11 22:20:22 +00:00

xpmr

Allow chan_usbradio to compile again.

2007-10-17 16:09:01 +00:00

chan_agent.c

Change instances of AST_NONSTANDARD_APP_ARGS(foo, bar, ',') to AST_STANDARD_APP_ARGS(foo, bar)

2008-01-02 21:08:33 +00:00

chan_alsa.c

coding guidelines cleanup

2008-01-03 18:10:13 +00:00

chan_console.c

Remove compiler warning for uninitialized variable

2008-01-21 21:11:58 +00:00

chan_features.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

chan_gtalk.c

Merged revisions 97489 via svnmerge from

2008-01-09 16:59:09 +00:00

chan_h323.c

Merged revisions 94924 via svnmerge from

2007-12-27 17:34:00 +00:00

chan_iax2.c

Merged revisions 99004 via svnmerge from

2008-01-17 22:50:13 +00:00

chan_jingle.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

chan_local.c

Merged revisions 99426 via svnmerge from

2008-01-21 23:56:40 +00:00

chan_mgcp.c

Merged revisions 97195 via svnmerge from

2008-01-08 20:50:57 +00:00

chan_misdn.c

Merged revisions 96198 via svnmerge from

2008-01-03 14:47:30 +00:00

chan_nbs.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

chan_oss.c

make get_video_desc() return the active console if

2008-01-09 12:13:32 +00:00

chan_phone.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

chan_sip.c

Doxygen updates.

2008-01-21 21:10:07 +00:00

chan_skinny.c

Add proper call forwarding (all and busy) support for chan_skinny.

2008-01-14 17:40:36 +00:00

chan_unistim.c

remove unnecessary (char *) casts for ast_config_AST_* variables.

2007-12-18 09:46:18 +00:00

chan_usbradio.c

improve chan_usbradio to use indications just like chan_alsa/chan_oss do now

2008-01-05 01:05:50 +00:00

chan_vpb.cc

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

chan_zap.c

Fix distinctive ring detection.

2008-01-21 23:25:42 +00:00

console_board.c

The fixes in this commit are mainly to allow compiling of trunk with --enable-dev-mode, mutex profiling, lock debugging, etc. Mainly, the version.c needs to be in the OBJS line; asterisk.h was chosen to have the prototypes for ast_get_version, ast_get_version_num; and the ASTERISK_FILE_VERSION macro needs to be used after including asterisk.h in a few files. I hope I did the right thing. If not, let me know.

2008-01-10 00:50:39 +00:00

console_gui.c

remove a wrong 'const'

2008-01-09 18:12:44 +00:00

console_video.c

The fixes in this commit are mainly to allow compiling of trunk with --enable-dev-mode, mutex profiling, lock debugging, etc. Mainly, the version.c needs to be in the OBJS line; asterisk.h was chosen to have the prototypes for ast_get_version, ast_get_version_num; and the ASTERISK_FILE_VERSION macro needs to be used after including asterisk.h in a few files. I hope I did the right thing. If not, let me know.

2008-01-10 00:50:39 +00:00

console_video.h

Two changes:

2008-01-09 18:03:40 +00:00

DialTone.h

Doxygen updates, formatting.

2007-12-11 22:20:22 +00:00

iax2-parser.c

Start untangling header inclusion in a way that does not affect

2007-11-16 20:04:58 +00:00

iax2-parser.h

Merged revisions 75445 via svnmerge from

2007-07-17 20:49:09 +00:00

iax2-provision.c

HUGE improvements to QoS/CoS handling by IgorG

2007-12-16 10:51:53 +00:00

iax2-provision.h

Don't reload a configuration file if nothing has changed.

2007-08-16 21:09:46 +00:00

iax2.h

Doxygen updates, formatting.

2007-12-11 22:20:22 +00:00

Makefile

add support for textareas, used for various dialog windows on the gui.

2008-01-08 23:09:44 +00:00

misdn_config.c

another few errno.h removals

2007-11-19 21:18:14 +00:00

vcodecs.c

prevent a panic when destroying a channel with no incoming video.

2008-01-01 23:54:40 +00:00

vgrabbers.c

The fixes in this commit are mainly to allow compiling of trunk with --enable-dev-mode, mutex profiling, lock debugging, etc. Mainly, the version.c needs to be in the OBJS line; asterisk.h was chosen to have the prototypes for ast_get_version, ast_get_version_num; and the ASTERISK_FILE_VERSION macro needs to be used after including asterisk.h in a few files. I hope I did the right thing. If not, let me know.

2008-01-10 00:50:39 +00:00