From 0b51b1cc34f987518112c0af73d7a1b2842d123a Mon Sep 17 00:00:00 2001 From: jpeeler Date: Fri, 30 Apr 2010 22:47:26 +0000 Subject: 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.1@260440 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_dahdi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index b4d122e94..e54a8d8b2 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -5018,6 +5018,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) { -- cgit v1.2.3