diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-26 21:03:08 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-26 21:03:08 +0000 |
commit | bf4a5ea88a5b308fce39c8c6ff4ac25a77c287f3 (patch) | |
tree | f5f86a2981930184b35ccc656b7a4dde3dc40c0b /main/channel.c | |
parent | eedee5e779d466c9a13cbb104db2eeac383050fb (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.4@259018 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/channel.c')
-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 3c02beda6..679a41fb1 100644 --- a/main/channel.c +++ b/main/channel.c @@ -714,6 +714,7 @@ struct ast_channel *ast_channel_alloc(int needqueue, int state, const char *cid_ int flags; struct varshead *headp; va_list ap1, ap2; + char *tech; /* If shutting down, don't allocate any new channels */ if (shutting_down) { @@ -814,6 +815,7 @@ alertpipe_failed: tmp->cid.cid_num = ast_strdup(cid_num); 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. @@ -826,6 +828,10 @@ alertpipe_failed: ast_string_field_build_va(tmp, name, name_fmt, ap1, ap2); va_end(ap1); va_end(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? */ @@ -880,7 +886,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)) { manager_event(EVENT_FLAG_CALL, "Newchannel", "Channel: %s\r\n" "State: %s\r\n" |