[asterisk-dev] unneeded line removal? [was: Re: [svn-commits] jpeeler: branch 1.4 r260434 - /branches/1.4/channels/chan_dahdi.c]

[Tzafrir Cohen]

Hi,

I seem to have missed the following and only noticed it now:

On Fri, Apr 30, 2010 at 10:22:50PM -0000, SVN commits to the Digium repositories wrote:
> Author: jpeeler
> Date: Fri Apr 30 17:22:46 2010
> New Revision: 260434
> 
> URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=260434
> Log:
> 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.4/channels/chan_dahdi.c
> 
> Modified: branches/1.4/channels/chan_dahdi.c
> URL: http://svnview.digium.com/svn/asterisk/branches/1.4/channels/chan_dahdi.c?view=diff&rev=260434&r1=260433&r2=260434
> ==============================================================================
> --- branches/1.4/channels/chan_dahdi.c (original)
> +++ branches/1.4/channels/chan_dahdi.c Fri Apr 30 17:22:46 2010
> @@ -4445,7 +4445,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) {
>  						/* Cancel any running CallerID spill */
> 
> 

The 1.6.2 version of the patch only added the line. Any reason for
removing 'dahdi_set_hook' here?

It seems to make a FXS device keep ringing even after the device was
answered (or rather: re-start ringing after the device was answered,
which makes a funny noise of a ring at the time of the call).

-- 
               Tzafrir Cohen
icq#16849755              jabber:tzafrir.cohen at xorcom.com
+972-50-7952406           mailto:tzafrir.cohen at xorcom.com
http://www.xorcom.com  iax:guest at local.xorcom.com/tzafrir