Merged revisions 67593 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r67593 | file | 2007-06-06 08:18:36 -0400 (Wed, 06 Jun 2007) | 2 lines

Revert channel name splitting fix for Zap. The moral of the story is don't use - in your user/peer names. (issue #9668 reported by stevedavies)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@67594 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-06-06 12:20:27 +00:00
parent 1a3e65a793
commit 26268d3a9a

View File

@@ -298,17 +298,16 @@ static int __ast_device_state_changed_literal(char *buf)
{
char *device;
struct state_change *change;
char *tmp = NULL;
if (option_debug > 2)
ast_log(LOG_DEBUG, "Notification of state change to be queued on device/channel %s\n", buf);
device = buf;
if (!strncasecmp(device, "Zap", 3)) {
char *tmp = strrchr(device, '-');
if (tmp)
*tmp = '\0';
}
tmp = strrchr(device, '-');
if (tmp)
*tmp = '\0';
if (change_thread == AST_PTHREADT_NULL || !(change = ast_calloc(1, sizeof(*change) + strlen(device)))) {
/* we could not allocate a change struct, or */