dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 89095 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89095 | file | 2007-11-07 19:53:25 -0400 (Wed, 07 Nov 2007) | 4 lines

If callerid is configured in sip.conf use that for checking the presence of an extension in the dialplan.
(closes issue #11185)
Reported by: spditner

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89096 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
file 2007-11-07 23:55:08 +00:00
parent 00b58b837a
commit 1101f70bd7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_sip.c
View File

@ -9589,7 +9589,7 @@ static int get_destination(struct sip_pvt *p, struct sip_request *oreq)
/* Check the dialplan for the username part of the request URI,
the domain will be stored in the SIPDOMAIN variable
Return 0 if we have a matching extension */
if (ast_exists_extension(NULL, p->context, uri, 1, from) ||
if (ast_exists_extension(NULL, p->context, uri, 1, S_OR(p->cid_num, from)) ||
!strcmp(uri, ast_pickup_ext())) {
if (!oreq)
ast_string_field_set(p, exten, uri);
@ -9612,7 +9612,7 @@ static int get_destination(struct sip_pvt *p, struct sip_request *oreq)
/* Return 1 for pickup extension or overlap dialling support (if we support it) */
if((ast_test_flag(&global_flags[1], SIP_PAGE2_ALLOWOVERLAP) &&
ast_canmatch_extension(NULL, p->context, uri, 1, from)) ||
ast_canmatch_extension(NULL, p->context, uri, 1, S_OR(p->cid_num, from))) ||
!strncmp(uri, ast_pickup_ext(), strlen(uri))) {
return 1;
}