[asterisk-commits] file: branch 1.6.1 r178232 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Feb 24 09:22:25 2009
New Revision: 178232

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=178232
Log:
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
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=178232&r1=178231&r2=178232
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Tue Feb 24 09:22:25 2009
@@ -19118,7 +19118,7 @@
 /*! \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 @@
 		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);