[asterisk-dev] Re: [svn-commits] oej: branch 1.4 r48985 - in /branches/1.4: channels/ configs/

[Jason Parker]

You still have:

} else if (!strcasecmp(v->name, "buggyciscomwi")) { 


I also don't know that "buggymwi" is appropriate either.  There are many ways for mwi handling to be "buggy"

----- svn-commits at lists.digium.com wrote:
> Author: oej
> Date: Wed Dec 27 11:59:53 2006
> New Revision: 48985
> 
> URL: http://svn.digium.com/view/asterisk?view=rev&rev=48985
> Log:
> Be a bit more politically correct
> 
> Modified:
>     branches/1.4/channels/chan_sip.c
>     branches/1.4/configs/sip.conf.sample
> 
> Modified: branches/1.4/channels/chan_sip.c
> URL:
> http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_sip.c?view=diff&rev=48985&r1=48984&r2=48985
> ==============================================================================
> --- branches/1.4/channels/chan_sip.c (original)
> +++ branches/1.4/channels/chan_sip.c Wed Dec 27 11:59:53 2006
> @@ -782,11 +782,11 @@
>  #define SIP_PAGE2_CALL_ONHOLD_ONEDIR	(1 << 23)	/*!< 23: One
> directional hold */
>  #define SIP_PAGE2_CALL_ONHOLD_INACTIVE	(1 << 24)	/*!< 24: Inactive 
> */
>  #define SIP_PAGE2_RFC2833_COMPENSATE    (1 << 25)	/*!< 25: ???? */
> -#define SIP_PAGE2_BUGGY_CISCO_MWI	(1 << 26)	/*!< 26: Buggy CISCO MWI
> fix */
> +#define SIP_PAGE2_BUGGY_MWI		(1 << 26)	/*!< 26: Buggy CISCO MWI fix
> */
>  
>  #define SIP_PAGE2_FLAGS_TO_COPY \
>  	(SIP_PAGE2_ALLOWSUBSCRIBE | SIP_PAGE2_ALLOWOVERLAP |
> SIP_PAGE2_VIDEOSUPPORT | \
> -	SIP_PAGE2_T38SUPPORT | SIP_PAGE2_RFC2833_COMPENSATE |
> SIP_PAGE2_BUGGY_CISCO_MWI)
> +	SIP_PAGE2_T38SUPPORT | SIP_PAGE2_RFC2833_COMPENSATE |
> SIP_PAGE2_BUGGY_MWI)
>  
>  /* SIP packet flags */
>  #define SIP_PKT_DEBUG		(1 << 0)	/*!< Debug this packet */
> @@ -6968,8 +6968,8 @@
>  		S_OR(vmexten, default_vmexten), S_OR(p->fromdomain,
> ast_inet_ntoa(p->ourip)));
>  	/* Cisco has a bug in the SIP stack where it can't accept the
>  		(0/0) notification. This can temporarily be disabled in
> -		sip.conf with the "buggyciscomwi" option */
> -	ast_build_string(&t, &maxbytes, "Voice-Message: %d/%d%s\r\n",
> newmsgs, oldmsgs, (ast_test_flag(&p->flags[1],
> SIP_PAGE2_BUGGY_CISCO_MWI) ? "" : " (0/0)"));
> +		sip.conf with the "buggymwi" option */
> +	ast_build_string(&t, &maxbytes, "Voice-Message: %d/%d%s\r\n",
> newmsgs, oldmsgs, (ast_test_flag(&p->flags[1], SIP_PAGE2_BUGGY_MWI) ?
> "" : " (0/0)"));
>  
>  	if (p->subscribed) {
>  		if (p->expiry)
> @@ -15333,8 +15333,8 @@
>  		ast_set2_flag(&flags[1], ast_true(v->value),
> SIP_PAGE2_RFC2833_COMPENSATE);
>  		res = 1;
>  	} else if (!strcasecmp(v->name, "buggyciscomwi")) {
> -		ast_set_flag(&mask[1], SIP_PAGE2_BUGGY_CISCO_MWI);
> -		ast_set2_flag(&flags[1], ast_true(v->value),
> SIP_PAGE2_BUGGY_CISCO_MWI);
> +		ast_set_flag(&mask[1], SIP_PAGE2_BUGGY_MWI);
> +		ast_set2_flag(&flags[1], ast_true(v->value), SIP_PAGE2_BUGGY_MWI);
>  		res = 1;
>  	} 
>  
> 
> Modified: branches/1.4/configs/sip.conf.sample
> URL:
> http://svn.digium.com/view/asterisk/branches/1.4/configs/sip.conf.sample?view=diff&rev=48985&r1=48984&r2=48985
> ==============================================================================
> --- branches/1.4/configs/sip.conf.sample (original)
> +++ branches/1.4/configs/sip.conf.sample Wed Dec 27 11:59:53 2006
> @@ -66,7 +66,7 @@
>  				; Defaults to 100 ms
>  ;notifymimetype=text/plain	; Allow overriding of mime type in MWI
> NOTIFY
>  ;checkmwi=10			; Default time between mailbox checks for peers
> -;buggyciscomwi=no		; Cisco SIP firmware doesn't support the MWI RFC
> +;buggymwi=no			; Cisco SIP firmware doesn't support the MWI RFC
>  				; fully. Enable this option to not get error messages
>  				; when sending MWI to phones with this bug.
>  ;vmexten=voicemail		; dialplan extension to reach mailbox sets the 
> 
> _______________________________________________
> --Bandwidth and Colocation provided by Easynews.com --
> 
> svn-commits mailing list
> To UNSUBSCRIBE or update options visit:
>    http://lists.digium.com/mailman/listinfo/svn-commits


-- 
Jason Parker
Digium