diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-05 05:08:50 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-05 05:08:50 +0000 |
| commit | f05aa97fe5ee633cffc5641a9395f0c06ca27de5 (patch) | |
| tree | ae71fb6b76d48d499d0f8c8db72cfb68cc837b7f /channels/chan_phone.c | |
| parent | 85d8708df8c31feb766348a0772cc0c652765aa5 (diff) | |
Fix an issue that would cause a NewCallerID manager event to be generated
before the channel's NewChannel event. This was due to a somewhat recent
change that included using ast_set_callerid() where it wasn't before. This
function should not be used in the channel driver "new" functions.
(issue #7654, fixed by me)
Also, fix a couple minor bugs in usecount handling. chan_iax2 could have
increased the usecount but then returned an error. The place where chan_sip
increased the usecount did not call ast_update_usecount()
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@38904 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_phone.c')
| -rw-r--r-- | channels/chan_phone.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/channels/chan_phone.c b/channels/chan_phone.c index 0cb57fc11..18fc8eaf8 100644 --- a/channels/chan_phone.c +++ b/channels/chan_phone.c @@ -825,7 +825,14 @@ static struct ast_channel *phone_new(struct phone_pvt *i, int state, char *conte strncpy(tmp->exten, "s", sizeof(tmp->exten) - 1); if (!ast_strlen_zero(i->language)) strncpy(tmp->language, i->language, sizeof(tmp->language)-1); - ast_set_callerid(tmp, i->cid_num, i->cid_name, i->cid_num); + + if (!ast_strlen_zero(i->cid_num)) { + tmp->cid.cid_num = strdup(i->cid_num); + tmp->cid.cid_ani = strdup(i->cid_num); + } + if (!ast_strlen_zero(i->cid_name)) + tmp->cid.cid_name = strdup(i->cid_name); + i->owner = tmp; ast_mutex_lock(&usecnt_lock); usecnt++; |