diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 18:32:58 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 18:32:58 +0000 |
| commit | e93ac767d88ff4e2bae84eaa60d37b779fc049d3 (patch) | |
| tree | 60bd657daf08702952e0907fd9f4a8289a6a5fb8 /channels | |
| parent | 9ee8e2eb77bb664444d9fed921a4461df49ac9aa (diff) | |
Don't overwrite caller ID name on a trunk with the configured fullname when using users.conf
(issue ABE-1989)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@228547 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 0477aa0ad..80300ceb9 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -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")) { |