diff options
| -rw-r--r-- | channels/chan_sip.c | 12 | ||||
| -rw-r--r-- | configs/sip.conf.sample | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index f1bbd50b3..aaf36f00f 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -779,11 +779,11 @@ struct sip_auth { #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 */ @@ -7069,8 +7069,8 @@ static int transmit_notify_with_mwi(struct sip_pvt *p, int newmsgs, int oldmsgs, 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) @@ -15548,8 +15548,8 @@ static int handle_common_options(struct ast_flags *flags, struct ast_flags *mask 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; } diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index 8264644b1..450adbb81 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -70,7 +70,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; 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 |