[svn-commits] file: trunk r67595 - in /trunk: ./ main/devicestate.c

[svn-commits at lists.digium.com]

Author: file
Date: Wed Jun  6 07:21:33 2007
New Revision: 67595

URL: http://svn.digium.com/view/asterisk?view=rev&rev=67595
Log:
Merged revisions 67594 via svnmerge from 
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)

........

................

Modified:
    trunk/   (props changed)
    trunk/main/devicestate.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/devicestate.c
URL: http://svn.digium.com/view/asterisk/trunk/main/devicestate.c?view=diff&rev=67595&r1=67594&r2=67595
==============================================================================
--- trunk/main/devicestate.c (original)
+++ trunk/main/devicestate.c Wed Jun  6 07:21:33 2007
@@ -399,18 +399,17 @@
 {
 	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 */