[asterisk-commits] russell: branch russell/applicationmap_fixup r39106 - /team/russell/applicati...

[asterisk-commits at lists.digium.com]

Author: russell
Date: Sun Aug  6 23:07:01 2006
New Revision: 39106

URL: http://svn.digium.com/view/asterisk?rev=39106&view=rev
Log:
- add the app args to the verbose message when loading a dtnamic feature
- remove the code for autoservicing the other channel when running a dynamic
  feature for now since it doesn't work quite right and leave a note to look
  into it later.

Modified:
    team/russell/applicationmap_fixup/res/res_features.c

Modified: team/russell/applicationmap_fixup/res/res_features.c
URL: http://svn.digium.com/view/asterisk/team/russell/applicationmap_fixup/res/res_features.c?rev=39106&r1=39105&r2=39106&view=diff
==============================================================================
--- team/russell/applicationmap_fixup/res/res_features.c (original)
+++ team/russell/applicationmap_fixup/res/res_features.c Sun Aug  6 23:07:01 2006
@@ -947,7 +947,7 @@
 {
 	struct ast_app *app;
 	struct ast_call_feature *feature;
-	struct ast_channel *work, *service;
+	struct ast_channel *work;
 	int res;
 
 	AST_LIST_LOCK(&feature_list);
@@ -966,12 +966,10 @@
 		if (!ast_test_flag(feature, AST_FEATURE_FLAG_BYCALLER))
 			return FEATURE_RETURN_PASSDIGITS;
 		work = ast_test_flag(feature, AST_FEATURE_FLAG_ONSELF) ? chan : peer;
-		service = ast_test_flag(feature, AST_FEATURE_FLAG_ONPEER) ? peer : chan;
 	} else {
 		if (!ast_test_flag(feature, AST_FEATURE_FLAG_BYCALLEE))
 			return FEATURE_RETURN_PASSDIGITS;
 		work = ast_test_flag(feature, AST_FEATURE_FLAG_ONSELF) ? peer : chan;
-		service = ast_test_flag(feature, AST_FEATURE_FLAG_ONSELF) ? chan : peer;
 	}
 
 	if (!(app = pbx_findapp(feature->app))) {
@@ -979,9 +977,8 @@
 		return -2;
 	}
 
-	ast_autoservice_start(service);
+	/* XXX Should we service the other channel while this runs? */
 	res = pbx_exec(work, app, feature->app_args);
-	ast_autoservice_stop(service);
 
 	if (res == AST_PBX_KEEPALIVE)
 		return FEATURE_RETURN_PBX_KEEPALIVE;
@@ -2236,7 +2233,7 @@
 			ast_register_feature(feature);
 				
 			if (option_verbose >= 1)
-				ast_verbose(VERBOSE_PREFIX_2 "Mapping Feature '%s' to app '%s' with code '%s'\n", var->name, app, exten);  
+				ast_verbose(VERBOSE_PREFIX_2 "Mapping Feature '%s' to app '%s(%s)' with code '%s'\n", var->name, app, app_args, exten);  
 		}	 
 	}
 	ast_config_destroy(cfg);