aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_sip.c
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-02-24 15:22:25 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-02-24 15:22:25 +0000
commitb3b3cf5b2c6c703b016ee625be2e4b1ab602e2ee (patch)
treebd5a883eb77a6426479281ee718762f11052735f /channels/chan_sip.c
parent7280c80673d25cd7fe6865af913eea97c36bb3c1 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@178232 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_sip.c')
-rw-r--r--channels/chan_sip.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 9fd534730..608f78b08 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -19118,7 +19118,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;
@@ -19225,8 +19225,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);