[svn-commits] branch 1.2 r28794 - /branches/1.2/channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Fri May 19 14:39:55 2006
New Revision: 28794

URL: http://svn.digium.com/view/asterisk?rev=28794&view=rev
Log:
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:
    branches/1.2/channels/chan_sip.c

Modified: branches/1.2/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/chan_sip.c?rev=28794&r1=28793&r2=28794&view=diff
==============================================================================
--- branches/1.2/channels/chan_sip.c (original)
+++ branches/1.2/channels/chan_sip.c Fri May 19 14:39:55 2006
@@ -10823,13 +10823,17 @@
 			}
 			return 0;
 		}
-		/* Initialize the context if it hasn't been already */
+		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_copy_string(p->context, p->subscribecontext, sizeof(p->context));
 		else if (ast_strlen_zero(p->context))
 			strcpy(p->context, default_context);
 		/* Get destination right away */
-		gotdest = get_destination(p, NULL);
 		build_contact(p);
 		if (gotdest) {
 			if (gotdest < 0)