[svn-commits] trunk r28795 - in /trunk: ./ channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Fri May 19 14:43:33 2006
New Revision: 28795

URL: http://svn.digium.com/view/asterisk?rev=28795&view=rev
Log:
Merged revisions 28794 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r28794 | kpfleming | 2006-05-19 14:39:55 -0500 (Fri, 19 May 2006) | 2 lines

use the specified 'subscribecontext' for a peer rather than the context found via the target domain (domain contexts are for calls, not for subscriptions) (issue #7122, reported by raarts)

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=28795&r1=28794&r2=28795&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri May 19 14:43:33 2006
@@ -11702,14 +11702,19 @@
 		return 0;
 	}
 
-	/* Initialize the context if it hasn't been already */
+	/* Get destination right away */
+	gotdest = get_destination(p, NULL);
+
+	/* Initialize the context if it hasn't been already;
+	   note this is done _after_ handling any domain lookups,
+	   because the context specified there is for calls, not
+	   subscriptions
+	*/
 	if (!ast_strlen_zero(p->subscribecontext))
 		ast_string_field_set(p, context, p->subscribecontext);
 	else if (ast_strlen_zero(p->context))
 		ast_string_field_set(p, context, default_context);
 
-	/* Get destination right away */
-	gotdest = get_destination(p, NULL);
 	build_contact(p);
 	if (gotdest) {
 		transmit_response(p, "404 Not Found", req);