diff options
author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-31 22:36:57 +0000 |
---|---|---|
committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-31 22:36:57 +0000 |
commit | 1c4fdfd503883d806ba05da5d0e9156b54a4d51b (patch) | |
tree | 9f6767c938c54f0a60ab846d98a66569f9b2af4d /apps/app_followme.c | |
parent | 8a84d91c4b7fae45cbcbbada6fdb5adc9f5ea3a7 (diff) |
Add end_bridge_callback for app_follome and add AUTOLOOP flag to res_features
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@153270 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_followme.c')
-rw-r--r-- | apps/app_followme.c | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/apps/app_followme.c b/apps/app_followme.c index d383cf989..654bf373c 100644 --- a/apps/app_followme.c +++ b/apps/app_followme.c @@ -152,7 +152,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 */ @@ -805,7 +804,6 @@ static void findmeexec(struct fm_args *tpargs) 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 @@ 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); @@ -1028,6 +1025,27 @@ static int app_exec(struct ast_channel *chan, void *data) 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 @@ 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); @@ -1047,13 +1067,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); } |