[asterisk-commits] kharwell: trunk r434655 - in /trunk: ./ channels/ channels/sip/include/ confi...

[SVN commits to the Asterisk project]

Author: kharwell
Date: Fri Apr 10 16:06:23 2015
New Revision: 434655

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=434655
Log:
chan_sip: make progressinband default to no

After the "progressinband" value setting of "never" was updated to never send a
183 this separated its use from the "no" value. Since "never" was the default,
but most users probably expect "no" this patch updates the default for the
"progressinband" setting to "no."

ASTERISK-24835 #close
Reported by: Andrew Nagy
Review: https://reviewboard.asterisk.org/r/4606/
........

Merged revisions 434654 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/CHANGES
    trunk/channels/chan_sip.c
    trunk/channels/sip/include/sip.h
    trunk/configs/samples/sip.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/trunk/CHANGES?view=diff&rev=434655&r1=434654&r2=434655
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Fri Apr 10 16:06:23 2015
@@ -130,6 +130,9 @@
    connected line information update.  See the online option documentation for
    more information.  Defaults to 'no' as setting it to 'yes' can result in
    many unnecessary messages being sent to the caller.
+
+ * The configuration setting 'progressinband' now defaults to 'no', which
+   matches the actual behavior of previous versions.
 
 res_pjsip
 ------------------

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=434655&r1=434654&r2=434655
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri Apr 10 16:06:23 2015
@@ -29943,8 +29943,8 @@
 		ast_clear_flag(&flags[0], SIP_PROG_INBAND);
 		if (ast_true(v->value))
 			ast_set_flag(&flags[0], SIP_PROG_INBAND_YES);
-		else if (strcasecmp(v->value, "never"))
-			ast_set_flag(&flags[0], SIP_PROG_INBAND_NO);
+		else if (!strcasecmp(v->value, "never"))
+			ast_set_flag(&flags[0], SIP_PROG_INBAND_NEVER);
 	} else if (!strcasecmp(v->name, "promiscredir")) {
 		ast_set_flag(&mask[0], SIP_PROMISCREDIR);
 		ast_set2_flag(&flags[0], ast_true(v->value), SIP_PROMISCREDIR);

Modified: trunk/channels/sip/include/sip.h
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sip/include/sip.h?view=diff&rev=434655&r1=434654&r2=434655
==============================================================================
--- trunk/channels/sip/include/sip.h (original)
+++ trunk/channels/sip/include/sip.h Fri Apr 10 16:06:23 2015
@@ -291,8 +291,8 @@
 
 /* Sending PROGRESS in-band settings */
 #define SIP_PROG_INBAND        (3 << 25) /*!< DP: three settings, uses two bits */
-#define SIP_PROG_INBAND_NEVER  (0 << 25)
-#define SIP_PROG_INBAND_NO     (1 << 25)
+#define SIP_PROG_INBAND_NO     (0 << 25)
+#define SIP_PROG_INBAND_NEVER  (1 << 25)
 #define SIP_PROG_INBAND_YES    (2 << 25)
 
 #define SIP_USEPATH          (1 << 27) /*!< GDP: Trust and use incoming Path headers? */

Modified: trunk/configs/samples/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/samples/sip.conf.sample?view=diff&rev=434655&r1=434654&r2=434655
==============================================================================
--- trunk/configs/samples/sip.conf.sample (original)
+++ trunk/configs/samples/sip.conf.sample Fri Apr 10 16:06:23 2015
@@ -382,10 +382,10 @@
                                 ; In order for "noanswer" applications to work, you need to run
                                 ; the progress() application in the priority before the app.
 
-;progressinband=never           ; If we should generate in-band ringing always
+;progressinband=no              ; If we should generate in-band ringing. Always
                                 ; use 'never' to never use in-band signalling, even in cases
                                 ; where some buggy devices might not render it
-                                ; Valid values: yes, no, never Default: never
+                                ; Valid values: yes, no, never Default: no
 ;useragent=Asterisk PBX         ; Allows you to change the user agent string
                                 ; The default user agent string also contains the Asterisk
                                 ; version. If you don't want to expose this, change the