kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-11 20:38:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the problem of notification of a device state change to a device with a '-'

Browse Source 
in the name.  Could probably do with a better fix in trunk, but this bug has
been open way too long without a better solution.
Reported by: stevedavies
Patch by: tilghman
(Closes issue #9668)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@96575 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-01-04 23:03:40 +00:00
parent 6cc0887f56
commit 8770045be8
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
main/devicestate.c
View File

@@ -294,7 +294,7 @@ static void do_state_change(const char *device)
ast_hint_state_changed(device); ast_hint_state_changed(device);
} }
static int __ast_device_state_changed_literal(char *buf) static int __ast_device_state_changed_literal(char *buf, int norecurse)
{ {
char *device; char *device;
struct state_change *change; struct state_change *change;
@@ -305,10 +305,6 @@ static int __ast_device_state_changed_literal(char *buf)
device = buf; device = buf;
tmp = strrchr(device, '-');
if (tmp)
*tmp = '\0';
if (change_thread == AST_PTHREADT_NULL || !(change = ast_calloc(1, sizeof(*change) + strlen(device)))) { if (change_thread == AST_PTHREADT_NULL || !(change = ast_calloc(1, sizeof(*change) + strlen(device)))) {
/* we could not allocate a change struct, or */ /* we could not allocate a change struct, or */
/* there is no background thread, so process the change now */ /* there is no background thread, so process the change now */
@@ -324,6 +320,18 @@ static int __ast_device_state_changed_literal(char *buf)
AST_LIST_UNLOCK(&state_changes); AST_LIST_UNLOCK(&state_changes);
} }
/* The problem with this API is that a device may be called with the unique
* identifier appended or not, but it's separated from the channel name
* with a '-', which is also a legitimate character in a channel name. So,
* we have to force both names to get their names checked for state changes
* to ensure that the right one gets notified. Not a huge performance hit,
* but it might could be fixed by an enterprising programmer in trunk.
*/
if (!norecurse && (tmp = strrchr(device, '-'))) {
*tmp = '\0';
__ast_device_state_changed_literal(tmp, 1);
}
return 1; return 1;
} }
@@ -331,7 +339,7 @@ int ast_device_state_changed_literal(const char *dev)
{ {
char *buf; char *buf;
buf = ast_strdupa(dev); buf = ast_strdupa(dev);
return __ast_device_state_changed_literal(buf); return __ast_device_state_changed_literal(buf, 0);
} }
/*! \brief Accept change notification, add it to change queue */ /*! \brief Accept change notification, add it to change queue */
@@ -343,7 +351,7 @@ int ast_device_state_changed(const char *fmt, ...)
va_start(ap, fmt); va_start(ap, fmt);
vsnprintf(buf, sizeof(buf), fmt, ap); vsnprintf(buf, sizeof(buf), fmt, ap);
va_end(ap); va_end(ap);
return __ast_device_state_changed_literal(buf); return __ast_device_state_changed_literal(buf, 0);
} }
/*! \brief Go through the dev state change queue and update changes in the dev state thread */ /*! \brief Go through the dev state change queue and update changes in the dev state thread */