From be2caea0fa5a3fd96f7928624c9c1692a704b9e5 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Tue, 24 Feb 2009 15:20:47 +0000 Subject: [PATCH] Merged revisions 178213 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r178213 | file | 2009-02-24 11:18:38 -0400 (Tue, 24 Feb 2009) | 16 lines Merged revisions 178205 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r178205 | file | 2009-02-24 11:16:07 -0400 (Tue, 24 Feb 2009) | 9 lines Skip check for extension when subscribing for MWI. Since the remote side is not actually subscribing to a specific extension when subscribing for MWI just skip the check to see if the extension exists. They can't use it to specify the mailbox either since we require configuration of that in sip.conf (closes issue #14531) Reported by: festr ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@178224 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 7deb7e7b31..403fa01144 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -18202,7 +18202,7 @@ static void add_peer_mwi_subs(struct sip_peer *peer) /*! \brief Handle incoming SUBSCRIBE request */ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req, struct sockaddr_in *sin, int seqno, char *e) { - int gotdest; + int gotdest = 0; int res = 0; int firststate = AST_EXTENSION_REMOVED; struct sip_peer *authpeer = NULL; @@ -18308,8 +18308,10 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req, return 0; } - /* Get destination right away */ - gotdest = get_destination(p, NULL); + if (strcmp(event, "message-summary")) { + /* Get destination right away */ + gotdest = get_destination(p, NULL); + } /* Get full contact header - this needs to be used as a request URI in NOTIFY's */ parse_ok_contact(p, req);