kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-18 10:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't overwrite caller ID name on a trunk with the configured fullname when using users.conf

Browse Source 
(issue ABE-1989)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@228547 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2009-11-06 18:32:58 +00:00
parent 5f6bf9a820
commit 0eb5bea853
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/chan_sip.c
View File

@@ -17741,6 +17741,9 @@ static struct sip_user *build_user(const char *name, struct ast_variable *v, str
ast_callerid_split(v->value, user->cid_name, sizeof(user->cid_name), user->cid_num, sizeof(user->cid_num));
} else if (!strcasecmp(v->name, "fullname")) {
ast_copy_string(user->cid_name, v->value, sizeof(user->cid_name));
} else if (!strcasecmp(v->name, "trunkname")) {
/* This is actually for a trunk, so we don't want to override callerid */
ast_copy_string(user->cid_name, "", sizeof(user->cid_name));
} else if (!strcasecmp(v->name, "cid_number")) {
ast_copy_string(user->cid_num, v->value, sizeof(user->cid_num));
} else if (!strcasecmp(v->name, "callgroup")) {
@@ -17959,6 +17962,9 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str
ast_callerid_split(v->value, peer->cid_name, sizeof(peer->cid_name), peer->cid_num, sizeof(peer->cid_num));
} else if (!strcasecmp(v->name, "fullname")) {
ast_copy_string(peer->cid_name, v->value, sizeof(peer->cid_name));
} else if (!strcasecmp(v->name, "trunkname")) {
/* This is actually for a trunk, so we don't want to override callerid */
ast_copy_string(peer->cid_name, "", sizeof(peer->cid_name));
} else if (!strcasecmp(v->name, "cid_number")) {
ast_copy_string(peer->cid_num, v->value, sizeof(peer->cid_num));
} else if (!strcasecmp(v->name, "context")) {