aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-27 17:21:04 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-27 17:21:04 +0000
commit491dabee21a6ea473703370b1dca5f5694d7004d (patch)
treebf9500df8ad75782fea0bf865d531d2d1b4e2f59 /include
parent8f432e4050de297cefb7e4b79cbbe8102e271181 (diff)
Fix broken attended transfers
The bridge was terminating immediately after the attended transfer was completed. The problem was because upon reentering ast_channel_bridge nexteventts was checked to see if it was set and if so could possibly return AST_BRIDGE_COMPLETE. (closes issue #15183) Reported by: andrebarbosa Tested by: andrebarbosa, tootai, loloski git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@197145 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/channel.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index e71d89742..de3670f97 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -583,6 +583,7 @@ struct ast_bridge_config {
struct ast_flags features_callee;
struct timeval start_time;
struct timeval nexteventts;
+ struct timeval partialfeature_timer;
long feature_timer;
long timelimit;
long play_warning;