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/

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@434654 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/CHANGES b/CHANGES
index 2b86234fbcc4db9612e1521a3ca6338549958661..0355d3d5dbeccaef98872efe97747bb9e0a05cf9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,9 @@ chan_pjsip
    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
 ------------------
  * A new CLI command has been added: "pjsip show settings", which shows

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index fa577b887cb4060a548b80d23ab8631f049a8846..3f9d9e7541219874f988b86ca39fe5b0791c7f11 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -29961,8 +29961,8 @@ static int handle_common_options(struct ast_flags *flags, struct ast_flags *mask
                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);

diff --git a/channels/sip/include/sip.h b/channels/sip/include/sip.h
index c9ed11b98c9b269bc331a4190b5f279f1b9c4f4f..3ed3e8a33caf63fd9e370b88ef1d79d47db3b649 100644 (file)
--- a/channels/sip/include/sip.h
+++ b/channels/sip/include/sip.h
@@ -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? */

diff --git a/configs/samples/sip.conf.sample b/configs/samples/sip.conf.sample
index a438f464ddf9bd48824f0d543ce4f756bc7f9e84..a34b5fa3e03d545b80ac2326e7657e466d71f8fd 100644 (file)
--- a/configs/samples/sip.conf.sample
+++ b/configs/samples/sip.conf.sample
@@ -379,10 +379,10 @@ srvlookup=yes                   ; Enable DNS SRV lookups on outbound calls
                                 ; 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