[svn-commits] jpeeler: branch 1.6.1 r260440 - in /branches/1.6.1: ./ channels/chan_dahdi.c

Fri Apr 30 17:47:30 CDT 2010

Author: jpeeler
Date: Fri Apr 30 17:47:26 2010
New Revision: 260440

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=260440
Log:
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)
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_dahdi.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/channels/chan_dahdi.c?view=diff&rev=260440&r1=260439&r2=260440
==============================================================================

--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Fri Apr 30 17:47:26 2010
@@ -5018,6 +5018,7 @@
 					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) {


