diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-11-07 23:55:08 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-11-07 23:55:08 +0000 |
| commit | 7c6127ceef604a2b87fe5fa1ba78bd1afa86c539 (patch) | |
| tree | 159d02fc48647ac44d3ba4a8cad29e4365e9f5bc /channels | |
| parent | 97744f54e75c47e694ca640b007cbbfed9b2b1cc (diff) | |
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: https://origsvn.digium.com/svn/asterisk/trunk@89096 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index a9b81dad8..adfa2cead 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -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; } |