kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-24 14:56:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

If Monitor or a spy was added to a P2P or native bridged channel bring the channel back to the generic bridging core so the monitor or spy operations work.

Browse Source 
(closes issue #10943)
Reported by: julianjm


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@85552 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-10-15 14:55:04 +00:00
parent b5addcd9a5
commit 3cc997694d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/rtp.c
View File

@@ -2839,7 +2839,8 @@ static enum ast_bridge_result bridge_native_loop(struct ast_channel *c0, struct
/* Check if anything changed */ /* Check if anything changed */
if ((c0->tech_pvt != pvt0) || if ((c0->tech_pvt != pvt0) ||
(c1->tech_pvt != pvt1) || (c1->tech_pvt != pvt1) ||
(c0->masq || c0->masqr || c1->masq || c1->masqr)) { (c0->masq || c0->masqr || c1->masq || c1->masqr) ||
(c0->monitor || c0->spies || c1->monitor || c1->spies)) {
ast_log(LOG_DEBUG, "Oooh, something is weird, backing out\n"); ast_log(LOG_DEBUG, "Oooh, something is weird, backing out\n");
if (c0->tech_pvt == pvt0) if (c0->tech_pvt == pvt0)
if (pr0->set_rtp_peer(c0, NULL, NULL, 0, 0)) if (pr0->set_rtp_peer(c0, NULL, NULL, 0, 0))
@@ -3116,7 +3117,8 @@ static enum ast_bridge_result bridge_p2p_loop(struct ast_channel *c0, struct ast
/* Check if anything changed */ /* Check if anything changed */
if ((c0->tech_pvt != pvt0) || if ((c0->tech_pvt != pvt0) ||
(c1->tech_pvt != pvt1) || (c1->tech_pvt != pvt1) ||
(c0->masq || c0->masqr || c1->masq || c1->masqr)) { (c0->masq || c0->masqr || c1->masq || c1->masqr) ||
(c0->monitor || c0->spies || c1->monitor || c1->spies)) {
ast_log(LOG_DEBUG, "Oooh, something is weird, backing out\n"); ast_log(LOG_DEBUG, "Oooh, something is weird, backing out\n");
if ((c0->masq || c0->masqr) && (fr = ast_read(c0))) if ((c0->masq || c0->masqr) && (fr = ast_read(c0)))
ast_frfree(fr); ast_frfree(fr);