From 42e2cf61d8f4a2f026ffdb7b36dd0ad6da3df202 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Fri, 19 May 2006 19:43:33 +0000
Subject: [PATCH] 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)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@28795 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_sip.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 44e44f8647..32764b8cf7 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -11702,14 +11702,19 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
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);
--
GitLab