From 26268d3a9a50d7b7302cee38785d34fe235ddf7f Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Wed, 6 Jun 2007 12:20:27 +0000 Subject: [PATCH] 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 --- main/devicestate.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/main/devicestate.c b/main/devicestate.c index 46db60d6df..1b9d49d87c 100644 --- a/main/devicestate.c +++ b/main/devicestate.c @@ -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 */