kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-05-03 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some errant device states by making the devicestate API more strict in

Browse Source 
terms of the device argument (only without the unique identifier appended).
(closes issue #12771)
 Reported by: davidw
 Patches: 
       20080717__bug12771.diff.txt uploaded by Corydon76 (license 14)
 Tested by: davidw, jvandal, murf


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@133649 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-07-25 17:19:39 +00:00
parent 5ae8161b45
commit c5b4e1aec8
3 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
main/devicestate.c
View File

@@ -294,17 +294,13 @@ static void do_state_change(const char *device)
ast_hint_state_changed(device);
}
static int __ast_device_state_changed_literal(char *buf, int norecurse)
int ast_device_state_changed_literal(const char *device)
{
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);
ast_log(LOG_DEBUG, "Notification of state change to be queued on device/channel %s\n", device);
device = buf;
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 */
@@ -320,28 +316,9 @@ static int __ast_device_state_changed_literal(char *buf, int norecurse)
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(device, 1);
}
return 1;
}
int ast_device_state_changed_literal(const char *dev)
{
char *buf;
buf = ast_strdupa(dev);
return __ast_device_state_changed_literal(buf, 0);
}
/*! \brief Accept change notification, add it to change queue */
int ast_device_state_changed(const char *fmt, ...)
{
@@ -351,7 +328,7 @@ int ast_device_state_changed(const char *fmt, ...)
va_start(ap, fmt);
vsnprintf(buf, sizeof(buf), fmt, ap);
va_end(ap);
return __ast_device_state_changed_literal(buf, 0);
return ast_device_state_changed_literal(buf);
}
/*! \brief Go through the dev state change queue and update changes in the dev state thread */