[asterisk-commits] twilson: branch 1.4 r153270 - in /branches/1.4: apps/ res/

[SVN commits to the Asterisk project]

Author: twilson
Date: Fri Oct 31 17:36:57 2008
New Revision: 153270

URL: http://svn.digium.com/view/asterisk?view=rev&rev=153270
Log:
Add end_bridge_callback for app_follome and add AUTOLOOP flag to res_features

Modified:
    branches/1.4/apps/app_followme.c
    branches/1.4/res/res_features.c

Modified: branches/1.4/apps/app_followme.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/apps/app_followme.c?view=diff&rev=153270&r1=153269&r2=153270
==============================================================================
--- branches/1.4/apps/app_followme.c (original)
+++ branches/1.4/apps/app_followme.c Fri Oct 31 17:36:57 2008
@@ -152,7 +152,6 @@
 });
 
 static int ynlongest = 0;
-static time_t start_time, answer_time, end_time;
 
 static const char *featuredigittostr;
 static int featuredigittimeout = 5000;		/*!< Feature Digit Timeout */
@@ -805,7 +804,6 @@
 
 		if (option_debug > 1)	
 			ast_log(LOG_DEBUG, "Number %s timeout %ld\n", nm->number,nm->timeout);
-		time(&start_time);
 
 		number = ast_strdupa(nm->number);
 		if (option_debug > 2)
@@ -930,7 +928,6 @@
 	int duration = 0;
 	struct ast_channel *caller;
 	struct ast_channel *outbound;
-	static char toast[80];
 	
 	AST_DECLARE_APP_ARGS(args,
 		AST_APP_ARG(followmeid);
@@ -1028,6 +1025,27 @@
 				ast_stream_and_wait(chan, targs.sorryprompt, chan->language, "");
 			res = 0;
 		} else {
+			auto void end_bridge_callback(void);
+			void end_bridge_callback (void)
+			{
+				char buf[80];
+				time_t end;
+
+				time(&end);
+
+				ast_channel_lock(chan);
+				if (chan->cdr->answer.tv_sec) {
+					snprintf(buf, sizeof(buf), "%ld", end - chan->cdr->answer.tv_sec);
+					pbx_builtin_setvar_helper(chan, "ANSWEREDTIME", buf);
+				}
+
+				if (chan->cdr->start.tv_sec) {
+					snprintf(buf, sizeof(buf), "%ld", end - chan->cdr->start.tv_sec);
+					pbx_builtin_setvar_helper(chan, "DIALEDTIME", buf);
+				}
+				ast_channel_unlock(chan);
+			}
+
 			caller = chan;
 			outbound = targs.outbound;
 			/* Bridge the two channels. */
@@ -1036,7 +1054,9 @@
 			ast_set_flag(&(config.features_callee), AST_FEATURE_REDIRECT);
 			ast_set_flag(&(config.features_callee), AST_FEATURE_AUTOMON);
 			ast_set_flag(&(config.features_caller), AST_FEATURE_AUTOMON);
-				
+
+			config.end_bridge_callback = end_bridge_callback;
+
 			ast_moh_stop(caller);
 			/* Be sure no generators are left on it */
 			ast_deactivate_generator(caller);
@@ -1047,13 +1067,7 @@
 				ast_hangup(outbound);
 				goto outrun;
 			}
-			time(&answer_time);
 			res = ast_bridge_call(caller,outbound,&config);
-			time(&end_time);
-			snprintf(toast, sizeof(toast), "%ld", (long)(end_time - start_time));
-			pbx_builtin_setvar_helper(caller, "DIALEDTIME", toast);
-			snprintf(toast, sizeof(toast), "%ld", (long)(end_time - answer_time));
-			pbx_builtin_setvar_helper(caller, "ANSWEREDTIME", toast);
 			if (outbound)
 				ast_hangup(outbound);
 		}

Modified: branches/1.4/res/res_features.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_features.c?view=diff&rev=153270&r1=153269&r2=153270
==============================================================================
--- branches/1.4/res/res_features.c (original)
+++ branches/1.4/res/res_features.c Fri Oct 31 17:36:57 2008
@@ -1449,6 +1449,7 @@
 	int diff;
 	int hasfeatures=0;
 	int hadfeatures=0;
+	int autoloopflag;
 	struct ast_option_header *aoh;
 	struct ast_bridge_config backup_config;
 	struct ast_cdr *bridge_cdr = NULL;
@@ -1716,6 +1717,8 @@
 		config->end_bridge_callback();
 	}
 
+	autoloopflag = ast_test_flag(chan, AST_FLAG_IN_AUTOLOOP);
+	ast_set_flag(chan, AST_FLAG_IN_AUTOLOOP);
 	if (res != AST_PBX_KEEPALIVE && !ast_test_flag(&(config->features_caller),AST_FEATURE_NO_H_EXTEN) && ast_exists_extension(chan, chan->context, "h", 1, chan->cid.cid_num)) {
 		struct ast_cdr *swapper;
 		char savelastapp[AST_MAX_EXTENSION];
@@ -1760,6 +1763,7 @@
 		ast_copy_string(bridge_cdr->lastapp, savelastapp, sizeof(bridge_cdr->lastapp));
 		ast_copy_string(bridge_cdr->lastdata, savelastdata, sizeof(bridge_cdr->lastdata));
 	}
+	ast_set2_flag(chan, autoloopflag, AST_FLAG_IN_AUTOLOOP);
 
 	/* obey the NoCDR() wishes. -- move the DISABLED flag to the bridge CDR if it was set on the channel during the bridge... */
 	if (res != AST_PBX_KEEPALIVE) {