Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

don't force CLID to be a phone-number-looking-thingie (issue #5325)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6778 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Kevin P. Fleming 20 years ago
parent 28dacd0815
commit 454061ec18
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
channels/chan_sip.c
Unescape View File

@ -4685,7 +4685,7 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho
char tmp[BUFSIZ/2]; char tmp[BUFSIZ/2];
char tmp2[BUFSIZ/2]; char tmp2[BUFSIZ/2];
char iabuf[INET_ADDRSTRLEN]; char iabuf[INET_ADDRSTRLEN];
char *l = default_callerid, *n = NULL; char *l = NULL, *n = NULL;
int x; int x;
char urioptions[256]=""; char urioptions[256]="";
@ -4720,13 +4720,13 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho
l = p->owner->cid.cid_num; l = p->owner->cid.cid_num;
n = p->owner->cid.cid_name; n = p->owner->cid.cid_name;
} }
if (!l || (!ast_isphonenumber(l) && default_callerid[0]))
l = default_callerid;
/* if we are not sending RPID and user wants his callerid restricted */ /* if we are not sending RPID and user wants his callerid restricted */
if (!ast_test_flag(p, SIP_SENDRPID) && ((p->callingpres & AST_PRES_RESTRICTION) != AST_PRES_ALLOWED)) { if (!ast_test_flag(p, SIP_SENDRPID) && ((p->callingpres & AST_PRES_RESTRICTION) != AST_PRES_ALLOWED)) {
l = CALLERID_UNKNOWN; l = CALLERID_UNKNOWN;
n = l; n = l;
} }
if (!l)
l = default_callerid;
if (!n || ast_strlen_zero(n)) if (!n || ast_strlen_zero(n))
n = l; n = l;
/* Allow user to be overridden */ /* Allow user to be overridden */

Write Preview
Loading…
Cancel
Save