Merged revisions 153181 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r153181 | twilson | 2008-10-31 13:55:33 -0500 (Fri, 31 Oct 2008) | 5 lines
  
  Recent CDR fixes moved execution of the 'h' exten into the bridging code, so variables that were set after ast_bridge_call was called would not show up in the 'h' exten.  Added a callback function to handle setting variables, etc. from w/in the bridging code.  Calls back into a nested function within the function calling ast_bridge_call
  
  (closes issue #13793)
  Reported by: greenfieldtech
........


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@153265 f38db490-d61c-443f-a65b-d21fe96a405b

3 files changed, 57 insertions, 22 deletions

diff --git a/apps/app_dial.c b/apps/app_dial.c
index eec675427..fa98e4633 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1238,7 +1238,6 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
 	int sentringing = 0, moh = 0;
 	const char *outbound_group = NULL;
 	int result = 0;
-	time_t start_time;
 	char *parse;
 	int opermode = 0;
 	AST_DECLARE_APP_ARGS(args,
@@ -1594,7 +1593,6 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
 		}
 	}
 
-	time(&start_time);
 	peer = wait_for_answer(chan, outgoing, &to, peerflags, &pa, &num, &result);
 
 	/* The ast_channel_datastore_remove() function could fail here if the
@@ -1616,10 +1614,9 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
 		/* almost done, although the 'else' block is 400 lines */
 	} else {
 		const char *number;
-		time_t end_time, answer_time = time(NULL);
-		char toast[80]; /* buffer to set variables */
 
 		strcpy(pa.status, "ANSWER");
+		pbx_builtin_setvar_helper(chan, "DIALSTATUS", pa.status);
 		/* Ah ha!  Someone answered within the desired timeframe.  Of course after this
 		   we will always return with -1 so that it is hung up properly after the
 		   conversation.  */
@@ -1837,11 +1834,31 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
 				res = ast_dtmf_stream(chan, peer, dtmfcalling, 250, 0);
 			}
 		}
-		
+
 		if (res) { /* some error */
 			res = -1;
-			end_time = time(NULL);
 		} 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);
+			}
+
 			if (ast_test_flag64(peerflags, OPT_CALLEE_TRANSFER))
 				ast_set_flag(&(config.features_callee), AST_FEATURE_REDIRECT);
 			if (ast_test_flag64(peerflags, OPT_CALLER_TRANSFER))
@@ -1865,6 +1882,8 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
 			if (ast_test_flag64(peerflags, OPT_GO_ON))
 				ast_set_flag(&(config.features_caller), AST_FEATURE_NO_H_EXTEN);
 
+			config.end_bridge_callback = end_bridge_callback;
+
 			if (moh) {
 				moh = 0;
 				ast_moh_stop(chan);
@@ -1895,14 +1914,8 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
 				ast_channel_setoption(chan, AST_OPTION_OPRMODE, &oprmode, sizeof(oprmode), 0);
 			}
 			res = ast_bridge_call(chan, peer, &config);
-			end_time = time(NULL);
-			snprintf(toast, sizeof(toast), "%ld", (long)(end_time - answer_time));
-			pbx_builtin_setvar_helper(chan, "ANSWEREDTIME", toast);
 		}
 
-		snprintf(toast, sizeof(toast), "%ld", (long)(end_time - start_time));
-		pbx_builtin_setvar_helper(chan, "DIALEDTIME", toast);
-
 		if (ast_test_flag64(&opts, OPT_PEER_H)) {
 			ast_log(LOG_NOTICE, "PEER context: %s; PEER exten: %s;  PEER priority: %d\n",
 				peer->context, peer->exten, peer->priority);
diff --git a/apps/app_followme.c b/apps/app_followme.c
index 4985f7726..bbc4e3e0c 100644
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -146,7 +146,6 @@ AST_APP_OPTIONS(followme_opts, {
 });
 
 static int ynlongest = 0;
-static time_t start_time, answer_time, end_time;
 
 static const char *featuredigittostr;
 static int featuredigittimeout = 5000;		/*!< Feature Digit Timeout */
@@ -770,7 +769,6 @@ static void findmeexec(struct fm_args *tpargs)
 	while (nm) {
 
 		ast_debug(2, "Number %s timeout %ld\n", nm->number,nm->timeout);
-		time(&start_time);
 
 		number = ast_strdupa(nm->number);
 		ast_debug(3, "examining %s\n", number);
@@ -889,7 +887,6 @@ static int app_exec(struct ast_channel *chan, void *data)
 	int duration = 0;
 	struct ast_channel *caller;
 	struct ast_channel *outbound;
-	static char toast[80];
 	
 	AST_DECLARE_APP_ARGS(args,
 		AST_APP_ARG(followmeid);
@@ -989,6 +986,27 @@ static int app_exec(struct ast_channel *chan, void *data)
 			ast_stream_and_wait(chan, targs.sorryprompt, "");
 		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. */
@@ -997,7 +1015,8 @@ static int app_exec(struct ast_channel *chan, void *data)
 		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);
@@ -1008,13 +1027,7 @@ static int app_exec(struct ast_channel *chan, void *data)
 			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);
 	}
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 1af45ad19..66c0bb614 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -3211,6 +3211,13 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
 	int callcompletedinsl;
 	struct ao2_iterator memi;
 	struct ast_datastore *datastore;
+	auto void end_bridge_callback(void);
+	void end_bridge_callback(void)
+	{
+		ao2_lock(qe->parent);
+		set_queue_variables(qe);
+		ao2_unlock(qe->parent);
+	}
 
 	ast_channel_lock(qe->chan);
 	datastore = ast_channel_datastore_find(qe->chan, &dialed_interface_info, NULL);
@@ -3281,6 +3288,8 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
 
 		}
 
+	bridge_config.end_bridge_callback = end_bridge_callback;
+
 	/* Hold the lock while we setup the outgoing calls */
 	if (use_weight)
 		ao2_lock(queues);