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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@162806 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 51bd89b98fadeb2cedf2b5b59f9f000aa0e578d7..fd71cda32cfaa280d88dd71b47e0070f9e4a5f4d 100644 (file)
--- 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)