[svn-commits] dvossel: branch dvossel/generic_aoc r256481 - /team/dvossel/generic_aoc/main/

[SVN commits to the Digium repositories]

Author: dvossel
Date: Thu Apr  8 16:20:30 2010
New Revision: 256481

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=256481
Log:
handle AST_CONTROL_AOC in ast_bridged_call

Modified:
    team/dvossel/generic_aoc/main/channel.c
    team/dvossel/generic_aoc/main/features.c

Modified: team/dvossel/generic_aoc/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/main/channel.c?view=diff&rev=256481&r1=256480&r2=256481
==============================================================================
--- team/dvossel/generic_aoc/main/channel.c (original)
+++ team/dvossel/generic_aoc/main/channel.c Thu Apr  8 16:20:30 2010
@@ -5720,6 +5720,7 @@
 
 			switch (f->subclass.integer) {
 			case AST_CONTROL_REDIRECTING:
+			case AST_CONTROL_AOC:
 				ast_indicate_data(other, f->subclass.integer, f->data.ptr, f->datalen);
 				break;
 			case AST_CONTROL_CONNECTED_LINE:
@@ -5727,7 +5728,6 @@
 					ast_indicate_data(other, f->subclass.integer, f->data.ptr, f->datalen);
 				}
 				break;
-			case AST_CONTROL_AOC:
 			case AST_CONTROL_HOLD:
 			case AST_CONTROL_UNHOLD:
 			case AST_CONTROL_VIDUPDATE:

Modified: team/dvossel/generic_aoc/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/main/features.c?view=diff&rev=256481&r1=256480&r2=256481
==============================================================================
--- team/dvossel/generic_aoc/main/features.c (original)
+++ team/dvossel/generic_aoc/main/features.c Thu Apr  8 16:20:30 2010
@@ -3188,6 +3188,7 @@
 					break;
 				}
 				/* The implied "else" falls through purposely */
+			case AST_CONTROL_AOC:
 			case AST_CONTROL_HOLD:
 			case AST_CONTROL_UNHOLD:
 				ast_indicate_data(other, f->subclass.integer, f->data.ptr, f->datalen);