diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-10 19:04:13 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-10 19:04:13 +0000 |
| commit | 62c424f2e22a99d1c2563bca462f40c079a94e75 (patch) | |
| tree | 5f5c29220bee1babce2f994d08913b11831fd303 /channels | |
| parent | a19cd5e952ea4a4c36ce5bd9862e7e1e796dc0e5 (diff) | |
Merged revisions 162805 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r162805 | file | 2008-12-10 15:02:57 -0400 (Wed, 10 Dec 2008) | 13 lines
Merged revisions 162804 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r162804 | file | 2008-12-10 15:01:17 -0400 (Wed, 10 Dec 2008) | 6 lines
Fix subscription based MWI up a bit. We only want to put sip: at the beginning of the URI if it is not already there and revert code to ignore destination check if subscribing for MWI.
(closes issue #12560)
Reported by: vsauer
Patches:
patch001.diff uploaded by ramonpeek (license 266)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@162806 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 51bd89b98..fd71cda32 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -8849,7 +8849,7 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho } else { if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) { /* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */ - snprintf(to, sizeof(to), "<%s%s>;tag=%s", (strncasecmp(p->uri, "sip:", 4) ? "" : "sip:"), p->uri, p->theirtag); + snprintf(to, sizeof(to), "<%s%s>;tag=%s", (!strncasecmp(p->uri, "sip:", 4) ? "" : "sip:"), p->uri, p->theirtag); } else if (p->options && p->options->vxml_url) { /* If there is a VXML URL append it to the SIP URL */ snprintf(to, sizeof(to), "<%s>;%s", p->uri, p->options->vxml_url); @@ -18154,7 +18154,7 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req, parse_ok_contact(p, req); build_contact(p); - if (strcmp(event, "message-summary") && gotdest) { + if (gotdest) { transmit_response(p, "404 Not Found", req); p->needdestroy = 1; if (authpeer) |