Merged revisions 67594 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Wed, 6 Jun 2007 12:21:33 +0000 (12:21 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 6 Jun 2007 12:21:33 +0000 (12:21 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r67594 | file | 2007-06-06 08:20:27 -0400 (Wed, 06 Jun 2007) | 10 lines

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/trunk@67595 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/devicestate.c

index a1b4c4c..f8e1a33 100644 (file)
@@ -399,18 +399,17 @@ 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 */
                /* there is no background thread, so process the change now */