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

..

h323

Merged revisions 103823 via svnmerge from

2008-02-19 20:31:15 +00:00

misdn

Merged revisions 109475 via svnmerge from

2008-03-18 16:26:59 +00:00

xpmr

…

chan_agent.c

Merged revisions 109576 via svnmerge from

2008-03-18 17:59:49 +00:00

chan_alsa.c

Merged revisions 106239 via svnmerge from

2008-03-06 00:22:20 +00:00

chan_console.c

Merged revisions 106239 via svnmerge from

2008-03-06 00:22:20 +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 112821 via svnmerge from

2008-04-04 19:30:35 +00:00

chan_h323.c

Merged revisions 114121 via svnmerge from

2008-04-14 18:34:37 +00:00

chan_iax2.c

Merged revisions 114609 via svnmerge from

2008-04-24 15:57:24 +00:00

chan_jingle.c

Merged revisions 107718 via svnmerge from

2008-03-11 20:54:38 +00:00

chan_local.c

Merged revisions 114625 via svnmerge from

2008-04-24 20:06:38 +00:00

chan_mgcp.c

Merged revisions 106239 via svnmerge from

2008-03-06 00:22:20 +00:00

chan_misdn.c

Merged revisions 114612 via svnmerge from

2008-04-24 16:48:05 +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

Merged revisions 108797 via svnmerge from

2008-03-14 20:09:53 +00:00

chan_phone.c

Merged revisions 106239 via svnmerge from

2008-03-06 00:22:20 +00:00

chan_sip.c

Merged revisions 114633 via svnmerge from

2008-04-24 21:36:05 +00:00

chan_skinny.c

Merged revisions 114024 via svnmerge from

2008-04-10 13:46:33 +00:00

chan_unistim.c

Merged revisions 114271 via svnmerge from

2008-04-18 19:36:26 +00:00

chan_usbradio.c

Merge changes from team/mvanbaak/cli-command-audit

2008-02-08 21:26:32 +00:00

chan_vpb.cc

Merged revisions 107525 via svnmerge from

2008-03-11 15:39:53 +00:00

chan_zap.c

Merged revisions 114389 via svnmerge from

2008-04-21 20:23:01 +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

Merged revisions 105841 via svnmerge from

2008-03-06 00:15:02 +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

…

iax2-parser.h

…

iax2-provision.c

HUGE improvements to QoS/CoS handling by IgorG

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

iax2-provision.h

…

iax2.h

Doxygen updates, formatting.

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

Makefile

Merged revisions 107715 via svnmerge from

2008-03-11 20:51:18 +00:00

misdn_config.c

Merged revisions 100930 via svnmerge from

2008-01-29 17:42:48 +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