From 66f3fd0028959aea0bbd1a9caed41ad4bd7f20b8 Mon Sep 17 00:00:00 2001 From: Kevin Harwell Date: Fri, 10 Apr 2015 21:06:23 +0000 Subject: [PATCH] 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 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@434655 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- CHANGES | 3 +++ channels/chan_sip.c | 4 ++-- channels/sip/include/sip.h | 4 ++-- configs/samples/sip.conf.sample | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 7bd4ac2702..4237c82e29 100644 --- a/CHANGES +++ b/CHANGES @@ -131,6 +131,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 b64ca08169..179aa0fe46 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -29943,8 +29943,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 24bb2396e8..771ed22b41 100644 --- 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 abcbdc941f..e52fa6db24 100644 --- a/configs/samples/sip.conf.sample +++ b/configs/samples/sip.conf.sample @@ -382,10 +382,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