[asterisk-commits] mmichelson: branch mmichelson/features_config r390750 - in /team/mmichelson/f...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Jun 6 16:34:11 CDT 2013


Author: mmichelson
Date: Thu Jun  6 16:34:09 2013
New Revision: 390750

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=390750
Log:
Resolve conflict and reset automerge.


Modified:
    team/mmichelson/features_config/   (props changed)
    team/mmichelson/features_config/apps/app_bridgewait.c
    team/mmichelson/features_config/main/bridging.c
    team/mmichelson/features_config/main/features.c
    team/mmichelson/features_config/main/stasis_message_router.c
    team/mmichelson/features_config/res/parking/parking_manager.c
    team/mmichelson/features_config/res/res_agi.c

Propchange: team/mmichelson/features_config/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/mmichelson/features_config/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun  6 16:34:09 2013
@@ -1,1 +1,1 @@
-/trunk:1-390707
+/trunk:1-390749

Modified: team/mmichelson/features_config/apps/app_bridgewait.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/features_config/apps/app_bridgewait.c?view=diff&rev=390750&r1=390749&r2=390750
==============================================================================
--- team/mmichelson/features_config/apps/app_bridgewait.c (original)
+++ team/mmichelson/features_config/apps/app_bridgewait.c Thu Jun  6 16:34:09 2013
@@ -141,7 +141,7 @@
 
 	/* Limits struct holds time as milliseconds, so muliply 1000x */
 	hold_limits.duration *= 1000;
-	ast_bridge_features_set_limits(features, &hold_limits, 1 /* remove_on_pull */);
+	ast_bridge_features_set_limits(features, &hold_limits, AST_BRIDGE_HOOK_REMOVE_ON_PULL);
 	ast_bridge_features_limits_destroy(&hold_limits);
 
 	return 0;

Modified: team/mmichelson/features_config/main/bridging.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/features_config/main/bridging.c?view=diff&rev=390750&r1=390749&r2=390750
==============================================================================
--- team/mmichelson/features_config/main/bridging.c (original)
+++ team/mmichelson/features_config/main/bridging.c Thu Jun  6 16:34:09 2013
@@ -76,7 +76,7 @@
 
 static void cleanup_video_mode(struct ast_bridge *bridge);
 static int bridge_make_compatible(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel);
-static void bridge_features_remove(struct ast_bridge_features *features, enum ast_bridge_hook_remove_flags flags);
+static void bridge_features_remove(struct ast_bridge_features *features, enum ast_bridge_hook_remove_flags remove_flags);
 
 /*! Default DTMF keys for built in features */
 static char builtin_features_dtmf[AST_BRIDGE_BUILTIN_END][MAXIMUM_DTMF_FEATURE_STRING];
@@ -4639,17 +4639,17 @@
  *
  * \param obj Feature hook object.
  * \param arg Removal flags
- * \param unused Not used
+ * \param flags Not used
  *
  * \retval CMP_MATCH if hook's remove_flags match the removal flags set.
  * \retval 0 if not match.
  */
-static int hook_remove_match(void *obj, void *arg, int unused)
+static int hook_remove_match(void *obj, void *arg, int flags)
 {
 	struct ast_bridge_hook *hook = obj;
-	enum ast_bridge_hook_remove_flags *flags = arg;
-
-	if (ast_test_flag(&hook->remove_flags, *flags)) {
+	enum ast_bridge_hook_remove_flags *remove_flags = arg;
+
+	if (ast_test_flag(&hook->remove_flags, *remove_flags)) {
 		return CMP_MATCH;
 	} else {
 		return 0;
@@ -4662,14 +4662,14 @@
  * \since 12.0.0
  *
  * \param hooks Hooks container to work on.
- * \param flags Determinator for whether hook is removed
+ * \param remove_flags Determinator for whether hook is removed
  *
  * \return Nothing
  */
-static void hooks_remove_container(struct ao2_container *hooks, enum ast_bridge_hook_remove_flags flags)
+static void hooks_remove_container(struct ao2_container *hooks, enum ast_bridge_hook_remove_flags remove_flags)
 {
 	ao2_callback(hooks, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE,
-		hook_remove_match, &flags);
+		hook_remove_match, &remove_flags);
 }
 
 /*!
@@ -4678,11 +4678,11 @@
  * \since 12.0.0
  *
  * \param hooks Hooks heap to work on.
- * \param flags Determinator for whether hook is removed
+ * \param remove_flags Determinator for whether hook is removed
  *
  * \return Nothing
  */
-static void hooks_remove_heap(struct ast_heap *hooks, enum ast_bridge_hook_remove_flags flags)
+static void hooks_remove_heap(struct ast_heap *hooks, enum ast_bridge_hook_remove_flags remove_flags)
 {
 	struct ast_bridge_hook *hook;
 	int changed;
@@ -4694,7 +4694,7 @@
 		changed = 0;
 		for (idx = ast_heap_size(hooks); idx; --idx) {
 			hook = ast_heap_peek(hooks, idx);
-			if (ast_test_flag(&hook->remove_flags, flags)) {
+			if (ast_test_flag(&hook->remove_flags, remove_flags)) {
 				ast_heap_remove(hooks, hook);
 				ao2_ref(hook, -1);
 				changed = 1;
@@ -4710,17 +4710,17 @@
  * \since 12.0.0
  *
  * \param features Bridge features structure
- * \param flags Determinator for whether hook is removed.
+ * \param remove_flags Determinator for whether hook is removed.
  *
  * \return Nothing
  */
-static void bridge_features_remove(struct ast_bridge_features *features, enum ast_bridge_hook_remove_flags flags)
-{
-	hooks_remove_container(features->dtmf_hooks, flags);
-	hooks_remove_container(features->hangup_hooks, flags);
-	hooks_remove_container(features->join_hooks, flags);
-	hooks_remove_container(features->leave_hooks, flags);
-	hooks_remove_heap(features->interval_hooks, flags);
+static void bridge_features_remove(struct ast_bridge_features *features, enum ast_bridge_hook_remove_flags remove_flags)
+{
+	hooks_remove_container(features->dtmf_hooks, remove_flags);
+	hooks_remove_container(features->hangup_hooks, remove_flags);
+	hooks_remove_container(features->join_hooks, remove_flags);
+	hooks_remove_container(features->leave_hooks, remove_flags);
+	hooks_remove_heap(features->interval_hooks, remove_flags);
 }
 
 static int interval_hook_time_cmp(void *a, void *b)

Modified: team/mmichelson/features_config/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/features_config/main/features.c?view=diff&rev=390750&r1=390749&r2=390750
==============================================================================
--- team/mmichelson/features_config/main/features.c (original)
+++ team/mmichelson/features_config/main/features.c Thu Jun  6 16:34:09 2013
@@ -3376,7 +3376,7 @@
 	}
 
 	return ast_bridge_dtmf_hook(features, dtmf, app_dtmf_feature_hook,
-		app_data, ast_free_ptr, 1);
+		app_data, ast_free_ptr, AST_BRIDGE_HOOK_REMOVE_ON_PULL);
 }
 
 static int setup_dynamic_feature(void *obj, void *arg, void *data, int flags)

Modified: team/mmichelson/features_config/main/stasis_message_router.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/features_config/main/stasis_message_router.c?view=diff&rev=390750&r1=390749&r2=390750
==============================================================================
--- team/mmichelson/features_config/main/stasis_message_router.c (original)
+++ team/mmichelson/features_config/main/stasis_message_router.c Thu Jun  6 16:34:09 2013
@@ -208,8 +208,8 @@
 static int add_route(struct stasis_message_router *router,
 		     struct stasis_message_route *route)
 {
+	RAII_VAR(struct stasis_message_route *, existing_route, NULL, ao2_cleanup);
 	SCOPED_AO2LOCK(lock, router);
-	RAII_VAR(struct stasis_message_route *, existing_route, NULL, ao2_cleanup);
 
 	if ((existing_route = find_route(router, route->message_type))) {
 		return -1;

Modified: team/mmichelson/features_config/res/parking/parking_manager.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/features_config/res/parking/parking_manager.c?view=diff&rev=390750&r1=390749&r2=390750
==============================================================================
--- team/mmichelson/features_config/res/parking/parking_manager.c (original)
+++ team/mmichelson/features_config/res/parking/parking_manager.c Thu Jun  6 16:34:09 2013
@@ -68,12 +68,12 @@
 		<managerEventInstance class="EVENT_FLAG_CALL">
 			<synopsis>Raised when a channel is parked.</synopsis>
 			<syntax>
-				<parameter name="ChannelParkee">
-				</parameter>
-				<parameter name="ChannelStateParkee">
+				<parameter name="ParkeeChannel">
+				</parameter>
+				<parameter name="ParkeeChannelState">
 					<para>A numeric code for the channel's current state, related to ChannelStateDesc</para>
 				</parameter>
-				<parameter name="ChannelStateDescParkee">
+				<parameter name="ParkeeChannelStateDesc">
 					<enumlist>
 						<enum name="Down"/>
 						<enum name="Rsrvd"/>
@@ -88,30 +88,30 @@
 						<enum name="Unknown"/>
 					</enumlist>
 				</parameter>
-				<parameter name="CallerIDNumParkee">
-				</parameter>
-				<parameter name="CallerIDNameParkee">
-				</parameter>
-				<parameter name="ConnectedLineNumParkee">
-				</parameter>
-				<parameter name="ConnectedLineNameParkee">
-				</parameter>
-				<parameter name="AccountCodeParkee">
-				</parameter>
-				<parameter name="ContextParkee">
-				</parameter>
-				<parameter name="ExtenParkee">
-				</parameter>
-				<parameter name="PriorityParkee">
-				</parameter>
-				<parameter name="UniqueidParkee">
-				</parameter>
-				<parameter name="ChannelParker">
-				</parameter>
-				<parameter name="ChannelStateParker">
+				<parameter name="ParkeeCallerIDNum">
+				</parameter>
+				<parameter name="ParkeeCallerIDName">
+				</parameter>
+				<parameter name="ParkeeConnectedLineNum">
+				</parameter>
+				<parameter name="ParkeeConnectedLineName">
+				</parameter>
+				<parameter name="ParkeeAccountCode">
+				</parameter>
+				<parameter name="ParkeeContext">
+				</parameter>
+				<parameter name="ParkeeExten">
+				</parameter>
+				<parameter name="ParkeePriority">
+				</parameter>
+				<parameter name="ParkeeUniqueid">
+				</parameter>
+				<parameter name="ParkerChannel">
+				</parameter>
+				<parameter name="ParkerChannelState">
 				<para>A numeric code for the channel's current state, related to ChannelStateDesc</para>
 				</parameter>
-				<parameter name="ChannelStateDescParker">
+				<parameter name="ParkerChannelStateDesc">
 					<enumlist>
 						<enum name="Down"/>
 						<enum name="Rsrvd"/>
@@ -126,23 +126,23 @@
 						<enum name="Unknown"/>
 					</enumlist>
 				</parameter>
-				<parameter name="CallerIDNumParker">
-				</parameter>
-				<parameter name="CallerIDNameParker">
-				</parameter>
-				<parameter name="ConnectedLineNumParker">
-				</parameter>
-				<parameter name="ConnectedLineNameParker">
-				</parameter>
-				<parameter name="AccountCodeParker">
-				</parameter>
-				<parameter name="ContextParker">
-				</parameter>
-				<parameter name="ExtenParker">
-				</parameter>
-				<parameter name="PriorityParker">
-				</parameter>
-				<parameter name="UniqueidParker">
+				<parameter name="ParkerCallerIDNum">
+				</parameter>
+				<parameter name="ParkerCallerIDName">
+				</parameter>
+				<parameter name="ParkerConnectedLineNum">
+				</parameter>
+				<parameter name="ParkerConnectedLineName">
+				</parameter>
+				<parameter name="ParkerAccountCode">
+				</parameter>
+				<parameter name="ParkerContext">
+				</parameter>
+				<parameter name="ParkerExten">
+				</parameter>
+				<parameter name="ParkerPriority">
+				</parameter>
+				<parameter name="ParkerUniqueid">
 				</parameter>
 				<parameter name="Parkinglot">
 					<para>Name of the parking lot that the parkee is parked in</para>
@@ -180,12 +180,12 @@
 			<synopsis>Raised when a channel leaves a parking lot because it was retrieved from the parking lot and reconnected.</synopsis>
 			<syntax>
 				<xi:include xpointer="xpointer(/docs/managerEvent[@name='ParkedCall']/managerEventInstance/syntax/parameter)" />
-				<parameter name="ChannelRetriever">
-				</parameter>
-				<parameter name="ChannelStateRetriever">
+				<parameter name="RetrieverChannel">
+				</parameter>
+				<parameter name="RetrieverChannelState">
 					<para>A numeric code for the channel's current state, related to ChannelStateDesc</para>
 				</parameter>
-				<parameter name="ChannelStateDescRetriever">
+				<parameter name="RetrieverChannelStateDesc">
 					<enumlist>
 						<enum name="Down"/>
 						<enum name="Rsrvd"/>
@@ -200,23 +200,23 @@
 						<enum name="Unknown"/>
 					</enumlist>
 				</parameter>
-				<parameter name="CallerIDNumRetriever">
-				</parameter>
-				<parameter name="CallerIDNameRetriever">
-				</parameter>
-				<parameter name="ConnectedLineNumRetriever">
-				</parameter>
-				<parameter name="ConnectedLineNameRetriever">
-				</parameter>
-				<parameter name="AccountCodeRetriever">
-				</parameter>
-				<parameter name="ContextRetriever">
-				</parameter>
-				<parameter name="ExtenRetriever">
-				</parameter>
-				<parameter name="PriorityRetriever">
-				</parameter>
-				<parameter name="UniqueidRetriever">
+				<parameter name="RetrieverCallerIDNum">
+				</parameter>
+				<parameter name="RetrieverCallerIDName">
+				</parameter>
+				<parameter name="RetrieverConnectedLineNum">
+				</parameter>
+				<parameter name="RetrieverConnectedLineName">
+				</parameter>
+				<parameter name="RetrieverAccountCode">
+				</parameter>
+				<parameter name="RetrieverContext">
+				</parameter>
+				<parameter name="RetrieverExten">
+				</parameter>
+				<parameter name="RetrieverPriority">
+				</parameter>
+				<parameter name="RetrieverUniqueid">
 				</parameter>
 			</syntax>
 		</managerEventInstance>

Modified: team/mmichelson/features_config/res/res_agi.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/features_config/res/res_agi.c?view=diff&rev=390750&r1=390749&r2=390750
==============================================================================
--- team/mmichelson/features_config/res/res_agi.c (original)
+++ team/mmichelson/features_config/res/res_agi.c Thu Jun  6 16:34:09 2013
@@ -985,10 +985,10 @@
 				<xi:include xpointer="xpointer(/docs/managerEvent[@name='AGIExecStart']/managerEventInstance/syntax/parameter)" />
 				<parameter name="ResultCode">
 					<para>The numeric result code from AGI</para>
-				</parameter
+				</parameter>
 				<parameter name="Result">
 					<para>The text result reason from AGI</para>
-				</parameter
+				</parameter>
 			</syntax>
 		</managerEventInstance>
 	</managerEvent>




More information about the asterisk-commits mailing list