[asterisk-commits] file: branch file/rtp_engine-mark2 r183315 - /team/file/rtp_engine-mark2/main/

[SVN commits to the Asterisk project]

Author: file
Date: Thu Mar 19 13:53:53 2009
New Revision: 183315

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=183315
Log:
IcanhazT38controlframes?

Modified:
    team/file/rtp_engine-mark2/main/rtp_engine.c

Modified: team/file/rtp_engine-mark2/main/rtp_engine.c
URL: http://svn.digium.com/svn-view/asterisk/team/file/rtp_engine-mark2/main/rtp_engine.c?view=diff&rev=183315&r1=183314&r2=183315
==============================================================================
--- team/file/rtp_engine-mark2/main/rtp_engine.c (original)
+++ team/file/rtp_engine-mark2/main/rtp_engine.c Thu Mar 19 13:53:53 2009
@@ -826,6 +826,7 @@
 			if ((fr->subclass == AST_CONTROL_HOLD) ||
 			    (fr->subclass == AST_CONTROL_UNHOLD) ||
 			    (fr->subclass == AST_CONTROL_VIDUPDATE) ||
+			    (fr->subclass == AST_CONTROL_T38) ||
 			    (fr->subclass == AST_CONTROL_SRCUPDATE)) {
 				/* If we are going on hold, then break callback mode and P2P bridging */
 				if (fr->subclass == AST_CONTROL_HOLD) {
@@ -931,6 +932,8 @@
 	instance0->bridged = instance1;
 	instance1->bridged = instance0;
 
+	ast_poll_channel_add(c0, c1);
+
 	/* Go into a loop handling any stray frames that may come in */
 	cs[0] = c0;
 	cs[1] = c1;
@@ -1036,6 +1039,7 @@
 			if ((fr->subclass == AST_CONTROL_HOLD) ||
 			    (fr->subclass == AST_CONTROL_UNHOLD) ||
 			    (fr->subclass == AST_CONTROL_VIDUPDATE) ||
+			    (fr->subclass == AST_CONTROL_T38) ||
 			    (fr->subclass == AST_CONTROL_SRCUPDATE)) {
 				if (fr->subclass == AST_CONTROL_HOLD) {
 					/* If we someone went on hold we want the other side to reinvite back to us */
@@ -1101,6 +1105,8 @@
 	instance0->bridged = NULL;
 	instance1->bridged = NULL;
 
+	ast_poll_channel_del(c0, c1);
+
 	return res;
 }