Merged revisions 51211 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 18 Jan 2007 00:20:50 +0000 (00:20 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 18 Jan 2007 00:20:50 +0000 (00:20 +0000)
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

main/rtp.c

index 05ca048..9f35d19 100644 (file)
@@ -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)) {
                        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;
                                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]);
                                }
                                        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;
                                ast_frfree(fr);
                        } else {
                                *fo = fr;