[asterisk-commits] dvossel: branch dvossel/generic_aoc r256986 - in /team/dvossel/generic_aoc: i...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Mon Apr 12 17:46:36 2010
New Revision: 256986

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=256986
Log:
removed aoc request manager event support

Modified:
    team/dvossel/generic_aoc/include/asterisk/aoc.h
    team/dvossel/generic_aoc/main/aoc.c

Modified: team/dvossel/generic_aoc/include/asterisk/aoc.h
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/include/asterisk/aoc.h?view=diff&rev=256986&r1=256985&r2=256986
==============================================================================
--- team/dvossel/generic_aoc/include/asterisk/aoc.h (original)
+++ team/dvossel/generic_aoc/include/asterisk/aoc.h Mon Apr 12 17:46:36 2010
@@ -432,7 +432,7 @@
  */
 int ast_aoc_decoded2str(const struct ast_aoc_decoded *decoded, struct ast_str **msg);
 
-/*! \brief generate AOC manager event */
+/*! \brief generate AOC manager event for an AOC-S, AOC-D, or AOC-E msg */
 int ast_aoc_manager_event(const struct ast_aoc_decoded *decoded, struct ast_channel *chan);
 
 /*! \brief get the message type, AOC-D, AOC-E, or AOC Request */

Modified: team/dvossel/generic_aoc/main/aoc.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/main/aoc.c?view=diff&rev=256986&r1=256985&r2=256986
==============================================================================
--- team/dvossel/generic_aoc/main/aoc.c (original)
+++ team/dvossel/generic_aoc/main/aoc.c Mon Apr 12 17:46:36 2010
@@ -1469,11 +1469,8 @@
 			ast_manager_event_multichan(EVENT_FLAG_AOC, "AOC-E", chan ? 1 : 0, chans, "%s", ast_str_buffer(msg));
 		}
 		break;
-	case AST_AOC_REQUEST:
-		if (chan) {
-			aoc_request_event(decoded, chan, &msg);
-			ast_manager_event(chan, EVENT_FLAG_AOC, "AOC-Request", "%s", ast_str_buffer(msg));
-		}
+	default:
+		/* events for AST_AOC_REQUEST are not generated here */
 		break;
 	}