diff options
author | Russell Bryant <russell@russellbryant.com> | 2006-08-05 05:26:29 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2006-08-05 05:26:29 +0000 |
commit | 663adb2b0e083fd4831114c57b5e541c8a7068a5 (patch) | |
tree | 1df8cab3abb122ebca5fcfb28de5552ae33c8802 /channels/chan_misdn.c | |
parent | f41f7f8c93ff3bd1178348481d235bb502480322 (diff) |
Merged revisions 38903-38904 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r38903 | russell | 2006-08-05 01:07:39 -0400 (Sat, 05 Aug 2006) | 2 lines
suppress a compiler warning about the usage of a potentially uninitialized variable
........
r38904 | russell | 2006-08-05 01:08:50 -0400 (Sat, 05 Aug 2006) | 10 lines
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: https://origsvn.digium.com/svn/asterisk/trunk@38905 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_misdn.c')
-rw-r--r-- | channels/chan_misdn.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 68f319cd1..f093af080 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -3099,9 +3099,11 @@ static struct ast_channel *misdn_new(struct chan_list *chlist, int state, char char *cid_name, *cid_num; ast_callerid_parse(callerid, &cid_name, &cid_num); - ast_set_callerid(tmp, cid_num,cid_name,cid_num); - } else { - ast_set_callerid(tmp, NULL,NULL,NULL); + /* Don't use ast_set_callerid() here because it will + * generate a NewCallerID event before the NewChannel event */ + tmp->cid.cid_num = ast_strdup(cid_num); + tmp->cid.cid_ani = ast_strdup(cid_num); + tmp->cid.cid_name = ast_strdup(cid_name); } { |