aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-22 21:06:53 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-22 21:06:53 +0000
commitcef676d20728ded5dd6b728e02ee09969238b588 (patch)
treed242775eb52c21bd48e86c4cb6d962418dc2c3ae
parent9ac1d8702202757f07329878735147de27a5fa5b (diff)
Merge revision 270404 from the 1.4 branch.
fixes FXS port still ringing when answered, as reported by Tzafrir on dev-list. (issue #17067) Reported by: tzafrir Tested by: alecdavis git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.4.33.1@271979 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_dahdi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index cd3b68673..d54c951df 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -4532,6 +4532,7 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast)
p->subs[index].f.frametype = AST_FRAME_CONTROL;
p->subs[index].f.subclass = AST_CONTROL_ANSWER;
/* Make sure it stops ringing */
+ dahdi_set_hook(p->subs[index].dfd, DAHDI_OFFHOOK);
p->subs[SUB_REAL].needringing = 0;
ast_log(LOG_DEBUG, "channel %d answered\n", p->channel);
if (p->cidspill) {