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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@260440 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index b4d122e943827fa443fb7eea864acc8ce8ec7132..e54a8d8b2185d96bb4de173b8d905554eac3773f 100644 (file)
--- 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) {