diff options
-rw-r--r-- | CHANGES | 3 | ||||
-rw-r--r-- | channels/chan_sip.c | 4 | ||||
-rw-r--r-- | channels/sip/include/sip.h | 4 | ||||
-rw-r--r-- | configs/samples/sip.conf.sample | 4 |
4 files changed, 9 insertions, 6 deletions
@@ -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 fa577b887..3f9d9e754 100644 --- 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 c9ed11b98..3ed3e8a33 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 a438f464d..a34b5fa3e 100644 --- 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 |