Add more frame types to forward in the RTP bridge loops.

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

diff --git a/main/rtp.c b/main/rtp.c
index 4203974c55f6251ce0665ed85f7c724193101c37..fdf4ed68ff281d56ca41e6b515e6fd4c9d9d0524 100644 (file)
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -2873,9 +2873,14 @@ static enum ast_bridge_result bridge_native_loop(struct ast_channel *c0, struct
                                return AST_BRIDGE_COMPLETE;
                        }
                } else {
-                       if ((fr->frametype == AST_FRAME_DTMF) ||
+                       if ((fr->frametype == AST_FRAME_DTMF_BEGIN) ||
+                           (fr->frametype == AST_FRAME_DTMF) ||
                            (fr->frametype == AST_FRAME_VOICE) ||
-                           (fr->frametype == AST_FRAME_VIDEO)) {
+                           (fr->frametype == AST_FRAME_VIDEO) ||
+                           (fr->frametype == AST_FRAME_IMAGE) ||
+                           (fr->frametype == AST_FRAME_HTML) ||
+                           (fr->frametype == AST_FRAME_MODEM) ||
+                           (fr->frametype == AST_FRAME_TEXT)) {
                                ast_write(other, fr);
                        }
                        ast_frfree(fr);
@@ -3082,12 +3087,17 @@ static enum ast_bridge_result bridge_p2p_loop(struct ast_channel *c0, struct ast
                                break;
                        }
                } else {
-                       /* If this is a DTMF, voice, or video frame write it to the other channel */
-                       if ((fr->frametype == AST_FRAME_DTMF) ||
+                       if ((fr->frametype == AST_FRAME_DTMF_BEGIN) ||
+                           (fr->frametype == AST_FRAME_DTMF) ||
                            (fr->frametype == AST_FRAME_VOICE) ||
-                           (fr->frametype == AST_FRAME_VIDEO)) {
+                           (fr->frametype == AST_FRAME_VIDEO) ||
+                           (fr->frametype == AST_FRAME_IMAGE) ||
+                           (fr->frametype == AST_FRAME_HTML) ||
+                           (fr->frametype == AST_FRAME_MODEM) ||
+                           (fr->frametype == AST_FRAME_TEXT)) {
                                ast_write(other, fr);
                        }
+
                        ast_frfree(fr);
                }
                /* Swap priority */