[asterisk-dev] Re: oej: branch 1.2 r46899 - /branches/1.2/channels/chan_sip.c

[Tony Mountifield]

In article <20061102151507.BCEEFA9498B at abita.digium.internal>,
 <svn-commits at lists.digium.com> wrote:
> Author: oej
> Date: Thu Nov  2 09:15:06 2006
> New Revision: 46899
> 
> URL: http://svn.digium.com/view/asterisk?rev=46899&view=rev
> Log:
> Don't overwrite flags in the packet
> 
> Modified:
>     branches/1.2/channels/chan_sip.c
> 
> Modified: branches/1.2/channels/chan_sip.c
> URL:
> http://svn.digium.com/view/asterisk/branches/1.2/channels/chan_sip.c?rev=46899&r1=46898&r2=46899&view=diff
> ==============================================================================
> --- branches/1.2/channels/chan_sip.c (original)
> +++ branches/1.2/channels/chan_sip.c Thu Nov  2 09:15:06 2006
> @@ -1289,7 +1289,8 @@
>  	pkt->next = p->packets;
>  	pkt->owner = p;
>  	pkt->seqno = seqno;
> -	pkt->flags = resp;
> +	if (resp)
> +		ast_set_flag(pkt->flags, FLAG_RESPONSE);
>  	pkt->data[len] = '\0';
>  	pkt->timer_t1 = p->timer_t1;	/* Set SIP timer T1 */
>  	if (fatal)
> 

This doesn't compile on 1.2:

chan_sip.c: In function `__sip_reliable_xmit':
chan_sip.c:1293: error: invalid type argument of `->'
chan_sip.c:1293: warning: type defaults to `int' in declaration of `__p'
chan_sip.c:1293: error: invalid type argument of `->'
chan_sip.c:1293: warning: comparison of distinct pointer types lacks a cast
chan_sip.c:1293: error: invalid type argument of `->'

Haven't tried it on 1.4 or trunk, but my first thought is: does ast_set_flag
exist in 1.2?

Cheers
Tony
-- 
Tony Mountifield
Work: tony at softins.co.uk - http://www.softins.co.uk
Play: tony at mountifield.org - http://tony.mountifield.org