diff options
| author | Mark Michelson <mmichelson@digium.com> | 2010-04-26 21:13:35 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2010-04-26 21:13:35 +0000 |
| commit | 317a12d950df8ee6734b7e709127dec6ebb2a488 (patch) | |
| tree | 224ffe46f8486b2417b9b7e0e94d870deb8bf611 /main | |
| parent | 26f47687022c47f816794973a5161c06e4a8b857 (diff) | |
Merged revisions 259018 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r259018 | mmichelson | 2010-04-26 16:03:08 -0500 (Mon, 26 Apr 2010) | 13 lines
Prevent Newchannel manager events for dummy channels.
No Newchannel manager event will be fired for channels that are
allocated to not match a registered technology type. Thus bogus
channels allocated solely for variable substitution or CDR
operations do not result in a Newchannel event.
(closes issue #16957)
Reported by: atis
Review: https://reviewboard.asterisk.org/r/601
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@259023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index b0366adab..2d23facfc 100644 --- a/main/channel.c +++ b/main/channel.c @@ -855,6 +855,7 @@ __ast_channel_alloc_ap(int needqueue, int state, const char *cid_num, const char int x; int flags; struct varshead *headp; + char *tech; /* If shutting down, don't allocate any new channels */ if (shutting_down) { @@ -977,6 +978,7 @@ alertpipe_failed: } if (!ast_strlen_zero(name_fmt)) { + char *slash; /* Almost every channel is calling this function, and setting the name via the ast_string_field_build() call. * And they all use slightly different formats for their name string. * This means, to set the name here, we have to accept variable args, and call the string_field_build from here. @@ -985,6 +987,10 @@ alertpipe_failed: * This new function was written so this can be accomplished. */ ast_string_field_build_va(tmp, name, name_fmt, ap1, ap2); + tech = ast_strdupa(tmp->name); + if ((slash = strchr(tech, '/'))) { + *slash = '\0'; + } } /* Reminder for the future: under what conditions do we NOT want to track cdrs on channels? */ @@ -1037,7 +1043,7 @@ alertpipe_failed: * proper and correct place to make this call, but you sure do have to pass * a lot of data into this func to do it here! */ - if (!ast_strlen_zero(name_fmt)) { + if (ast_get_channel_tech(tech)) { ast_manager_event(tmp, EVENT_FLAG_CALL, "Newchannel", "Channel: %s\r\n" "ChannelState: %d\r\n" |