[asterisk-commits] irroot: branch irroot/app_queue_skill r325599 - in /team/irroot/app_queue_ski...

[SVN commits to the Asterisk project]

Author: irroot
Date: Wed Jun 29 11:55:10 2011
New Revision: 325599

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=325599
Log:
Resolved Conflicts Introduced with r324364

Modified:
    team/irroot/app_queue_skill/   (props changed)
    team/irroot/app_queue_skill/apps/app_dial.c
    team/irroot/app_queue_skill/cel/cel_odbc.c   (props changed)
    team/irroot/app_queue_skill/configs/cel_odbc.conf.sample   (props changed)
    team/irroot/app_queue_skill/main/channel.c
    team/irroot/app_queue_skill/main/rtp_engine.c
    team/irroot/app_queue_skill/sounds/Makefile   (props changed)

Propchange: team/irroot/app_queue_skill/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/irroot/app_queue_skill/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/irroot/app_queue_skill/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 29 11:55:10 2011
@@ -1,1 +1,1 @@
-/trunk:322065-325534
+/trunk:322065-325597

Modified: team/irroot/app_queue_skill/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/app_queue_skill/apps/app_dial.c?view=diff&rev=325599&r1=325598&r2=325599
==============================================================================
--- team/irroot/app_queue_skill/apps/app_dial.c (original)
+++ team/irroot/app_queue_skill/apps/app_dial.c Wed Jun 29 11:55:10 2011
@@ -65,6 +65,7 @@
 #include "asterisk/aoc.h"
 #include "asterisk/ccss.h"
 #include "asterisk/indications.h"
+#include "asterisk/framehook.h"
 
 /*** DOCUMENTATION
 	<application name="Dial" language="en_US">
@@ -631,7 +632,8 @@
 	OPT_CALLER_HANGUP | OPT_CALLEE_TRANSFER | OPT_CALLER_TRANSFER | \
 	OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR | OPT_CALLEE_PARK |  \
 	OPT_CALLER_PARK | OPT_ANNOUNCE | OPT_CALLEE_MACRO | OPT_CALLEE_GOSUB) && \
-	!chan->audiohooks && !peer->audiohooks)
+	!chan->audiohooks && !peer->audiohooks && \
+	ast_framehook_list_is_empty(chan->framehooks) && ast_framehook_list_is_empty(peer->framehooks))
 
 /*
  * The list of active channels

Propchange: team/irroot/app_queue_skill/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 29 11:55:10 2011
@@ -1,1 +1,2 @@
 /be/branches/C.3/cel/cel_adaptive_odbc.c:256426
+/trunk/cel/cel_odbc.c:322065-325597

Propchange: team/irroot/app_queue_skill/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 29 11:55:10 2011
@@ -1,1 +1,2 @@
 /be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
+/trunk/configs/cel_odbc.conf.sample:322065-325597

Modified: team/irroot/app_queue_skill/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/app_queue_skill/main/channel.c?view=diff&rev=325599&r1=325598&r2=325599
==============================================================================
--- team/irroot/app_queue_skill/main/channel.c (original)
+++ team/irroot/app_queue_skill/main/channel.c Wed Jun 29 11:55:10 2011
@@ -7499,6 +7499,7 @@
 		    (c0->tech->bridge == c1->tech->bridge) &&
 		    !c0->monitor && !c1->monitor &&
 		    !c0->audiohooks && !c1->audiohooks &&
+		    ast_framehook_list_is_empty(c0->framehooks) && ast_framehook_list_is_empty(c1->framehooks) &&
 		    !c0->masq && !c0->masqr && !c1->masq && !c1->masqr) {
 			int timeoutms = to - 1000 > 0 ? to - 1000 : to;
 			/* Looks like they share a bridge method and nothing else is in the way */

Modified: team/irroot/app_queue_skill/main/rtp_engine.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/app_queue_skill/main/rtp_engine.c?view=diff&rev=325599&r1=325598&r2=325599
==============================================================================
--- team/irroot/app_queue_skill/main/rtp_engine.c (original)
+++ team/irroot/app_queue_skill/main/rtp_engine.c Wed Jun 29 11:55:10 2011
@@ -40,6 +40,7 @@
 #include "asterisk/translate.h"
 #include "asterisk/netsock2.h"
 #include "asterisk/_private.h"
+#include "asterisk/framehook.h"
 
 struct ast_srtp_res *res_srtp = NULL;
 struct ast_srtp_policy_res *res_srtp_policy = NULL;
@@ -853,7 +854,8 @@
 		if ((c0->tech_pvt != pvt0) ||
 		    (c1->tech_pvt != pvt1) ||
 		    (c0->masq || c0->masqr || c1->masq || c1->masqr) ||
-		    (c0->monitor || c0->audiohooks || c1->monitor || c1->audiohooks)) {
+		    (c0->monitor || c0->audiohooks || c1->monitor || c1->audiohooks) ||
+		    (!ast_framehook_list_is_empty(c0->framehooks) || !ast_framehook_list_is_empty(c1->framehooks))) {
 			ast_debug(1, "rtp-engine-local-bridge: Oooh, something is weird, backing out\n");
 			/* If a masquerade needs to happen we have to try to read in a frame so that it actually happens. Without this we risk being called again and going into a loop */
 			if ((c0->masq || c0->masqr) && (fr = ast_read(c0))) {
@@ -1046,7 +1048,8 @@
 		if ((c0->tech_pvt != pvt0) ||
 		    (c1->tech_pvt != pvt1) ||
 		    (c0->masq || c0->masqr || c1->masq || c1->masqr) ||
-		    (c0->monitor || c0->audiohooks || c1->monitor || c1->audiohooks)) {
+		    (c0->monitor || c0->audiohooks || c1->monitor || c1->audiohooks) ||
+		    (!ast_framehook_list_is_empty(c0->framehooks) || !ast_framehook_list_is_empty(c1->framehooks))) {
 			ast_debug(1, "Oooh, something is weird, backing out\n");
 			res = AST_BRIDGE_RETRY;
 			break;

Propchange: team/irroot/app_queue_skill/sounds/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 29 11:55:10 2011
@@ -1,2 +1,2 @@
 /be/branches/C.3/sounds/Makefile:256426
-/trunk/sounds/Makefile:270974
+/trunk/sounds/Makefile:270974,322065-325597