dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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: http://svn.digium.com/svn/asterisk/trunk@28795 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
kpfleming 2006-05-19 19:43:33 +00:00
parent b474b62f4a
commit 2f125fe36e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
channels/chan_sip.c
View File

@ -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);