From f1309f2c3f5505ee159c2d7e60e96dc4b4f1d9d6 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Wed, 7 Nov 2007 23:53:25 +0000 Subject: [PATCH] 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/branches/1.4@89095 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 18b1e8ffff..72137a9756 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -8718,7 +8718,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); @@ -8741,7 +8741,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; }