aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-11-03 22:37:55 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-11-03 22:37:55 +0000
commit754f926eae0912c6693e26fba9f3b94ad219dba2 (patch)
tree9dea579a946ea9f57ed1c8505e630b133da0015c /res
parent25330afbff77a273974b4ab51d69c8af05ada7d5 (diff)
Pass through flash hook
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4158 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rwxr-xr-xres/res_features.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/res/res_features.c b/res/res_features.c
index f79d2b4e2..98fb5fb19 100755
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -358,6 +358,8 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
/* We ran out of time */
config->timelimit = 0;
who = chan;
+ if (f)
+ ast_frfree(f);
f = NULL;
res = 0;
}
@@ -384,6 +386,12 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
else
ast_indicate(chan, -1);
}
+ if ((f->frametype == AST_FRAME_CONTROL) && (f->subclass == AST_CONTROL_FLASH)) {
+ if (who == chan)
+ ast_indicate(peer, AST_CONTROL_FLASH);
+ else
+ ast_indicate(chan, AST_CONTROL_FLASH);
+ }
if ((f->frametype == AST_FRAME_CONTROL) && (f->subclass == AST_CONTROL_OPTION)) {
aoh = f->data;
/* Forward option Requests */