From: Joshua Colp <jcolp@digium.com>
Date: Thu, 18 Jan 2007 00:20:50 +0000 (+0000)
Subject: Merged revisions 51211 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3449
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=461d49d2bdb523b470b47174923de6d46dffc3db;p=thirdparty%2Fasterisk.git

Merged revisions 51211 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r51211 | file | 2007-01-17 19:18:44 -0500 (Wed, 17 Jan 2007) | 2 lines

Pass data as well for hold/unhold/vidupdate frames. (issue #8840 reported by mdu113)

........


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

diff --git a/main/rtp.c b/main/rtp.c
index 05ca04891e..9f35d19a34 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -2931,7 +2931,7 @@ static enum ast_bridge_result bridge_native_loop(struct ast_channel *c0, struct
 			if ((fr->subclass == AST_CONTROL_HOLD) ||
 			    (fr->subclass == AST_CONTROL_UNHOLD) ||
 			    (fr->subclass == AST_CONTROL_VIDUPDATE)) {
-				ast_indicate(other, fr->subclass);
+				ast_indicate_data(other, fr->subclass, fr->data, fr->datalen);
 				ast_frfree(fr);
 			} else {
 				*fo = fr;
@@ -3145,7 +3145,7 @@ static enum ast_bridge_result bridge_p2p_loop(struct ast_channel *c0, struct ast
 					p0_callback = p2p_callback_enable(c0, p0, &p0_iod[0]);
 					p1_callback = p2p_callback_enable(c1, p1, &p1_iod[0]);
 				}
-				ast_indicate(other, fr->subclass);
+				ast_indicate_data(other, fr->subclass, fr->data, fr->datalen);
 				ast_frfree(fr);
 			} else {
 				*fo = fr;