[asterisk-commits] russell: tag 1.4.33.1 r271979 - in /tags/1.4.33.1: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Jun 22 16:06:53 2010
New Revision: 271979

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

Modified:
    tags/1.4.33.1/   (props changed)
    tags/1.4.33.1/channels/chan_dahdi.c

Propchange: tags/1.4.33.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 22 16:06:53 2010
@@ -1,1 +1,2 @@
+/branches/1.4:270404
 /trunk:228798

Modified: tags/1.4.33.1/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.4.33.1/channels/chan_dahdi.c?view=diff&rev=271979&r1=271978&r2=271979
==============================================================================
--- tags/1.4.33.1/channels/chan_dahdi.c (original)
+++ tags/1.4.33.1/channels/chan_dahdi.c Tue Jun 22 16:06:53 2010
@@ -4532,6 +4532,7 @@
 					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) {