diff options
author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-30 22:48:09 +0000 |
---|---|---|
committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-30 22:48:09 +0000 |
commit | fe4a3d336d4162612e50b4f13c104c72d2d6dbb5 (patch) | |
tree | c101e9e39c979c2f886cde09354cc8da060dbe95 | |
parent | 6cef6cf429719236107c41834ff6ded70d11f520 (diff) |
Merged revisions 260437 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r260437 | jpeeler | 2010-04-30 17:36:49 -0500 (Fri, 30 Apr 2010) | 18 lines
Merged revisions 260434 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r260434 | jpeeler | 2010-04-30 17:22:46 -0500 (Fri, 30 Apr 2010) | 11 lines
Ensure channel state is not incorrectly set in the case of a very early answer.
The needringing bit was being read in dahdi_read after answering thereby
setting the state to ringing from up. This clears needringing upon answering
so that is no longer possible.
(closes issue #17067)
Reported by: tzafrir
Patches:
needringing.diff uploaded by tzafrir (license 46)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@260441 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channels/chan_dahdi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 596fac2c2..0b8b17c13 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -6076,6 +6076,7 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) p->subs[idx].f.frametype = AST_FRAME_CONTROL; p->subs[idx].f.subclass = AST_CONTROL_ANSWER; /* Make sure it stops ringing */ + p->subs[SUB_REAL].needringing = 0; dahdi_set_hook(p->subs[idx].dfd, DAHDI_OFFHOOK); ast_debug(1, "channel %d answered\n", p->channel); if (p->cidspill) { |