diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-01-28 05:38:16 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-01-28 05:38:16 +0000 |
| commit | 0ab220f341d63bc6388f1039a9d1241ebcdf52e5 (patch) | |
| tree | 28da3c11f3da1c7051167327534304c6574fa92a /channels | |
| parent | 0afe5f03badc093bb7aea23e12ab4cdfb79c19c0 (diff) | |
Fix CID name when no CID name is supplied (bug #2795)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4908 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rwxr-xr-x | channels/chan_sip.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 71520f796..3132330ee 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -2014,10 +2014,10 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, char *title) tmp->callgroup = i->callgroup; tmp->pickupgroup = i->pickupgroup; tmp->cid.cid_pres = i->callingpres; - if (!ast_strlen_zero(i->accountcode)) - strncpy(tmp->accountcode, i->accountcode, sizeof(tmp->accountcode)-1); - if (i->amaflags) - tmp->amaflags = i->amaflags; + if (!ast_strlen_zero(i->accountcode)) + strncpy(tmp->accountcode, i->accountcode, sizeof(tmp->accountcode)-1); + if (i->amaflags) + tmp->amaflags = i->amaflags; if (!ast_strlen_zero(i->language)) strncpy(tmp->language, i->language, sizeof(tmp->language)-1); if (!ast_strlen_zero(i->musicclass)) @@ -5606,7 +5606,7 @@ static int check_user_full(struct sip_pvt *p, struct sip_request *req, char *cmd strncpy(p->cid_num, user->cid_num, sizeof(p->cid_num) - 1); ast_shrink_phone_number(p->cid_num); } - if (!ast_strlen_zero(user->cid_name) && !ast_strlen_zero(p->cid_name)) + if (!ast_strlen_zero(user->cid_name) && !ast_strlen_zero(p->cid_num)) strncpy(p->cid_name, user->cid_name, sizeof(p->cid_name) - 1); strncpy(p->username, user->name, sizeof(p->username) - 1); strncpy(p->peersecret, user->secret, sizeof(p->peersecret) - 1); |