[asterisk-commits] file: trunk r51212 - in /trunk: ./ main/rtp.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Wed Jan 17 18:20:50 2007
New Revision: 51212

URL: http://svn.digium.com/view/asterisk?view=rev&rev=51212
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/main/rtp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/rtp.c?view=diff&rev=51212&r1=51211&r2=51212
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Wed Jan 17 18:20:50 2007
@@ -2931,7 +2931,7 @@
 			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 @@
 					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;