sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main/devicestate: Prevent duplicate registration of device state providers 

Currently, the device state provider API will allow you to register a
device state provider with the same case insensitive name more than
once. This could cause strange issues, as the duplicate device state
providers will not be queried when a device's state has to be polled.
This patch updates the API such that a device state provider with the
same name as one that has already registered will be rejected.

Change-Id: I4a418a12280b7b6e4960bd44f302e27cd036ceb2
This commit is contained in:
Matt Jordan 2015-06-27 17:51:43 -05:00
parent 1b7760a8aa
commit f77e688f20
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/devicestate.c
View File

@ -397,6 +397,7 @@ enum ast_device_state ast_device_state(const char *device)
/*! \brief Add device state provider */
int ast_devstate_prov_add(const char *label, ast_devstate_prov_cb_type callback)
{
struct devstate_prov *devcb;
struct devstate_prov *devprov;
if (!callback || !(devprov = ast_calloc(1, sizeof(*devprov))))
@ -406,6 +407,14 @@ int ast_devstate_prov_add(const char *label, ast_devstate_prov_cb_type callback)
ast_copy_string(devprov->label, label, sizeof(devprov->label));
AST_RWLIST_WRLOCK(&devstate_provs);
AST_RWLIST_TRAVERSE(&devstate_provs, devcb, list) {
if (!strcasecmp(devcb->label, label)) {
ast_log(LOG_WARNING, "Device state provider '%s' already registered\n", label);
ast_free(devprov);
AST_RWLIST_UNLOCK(&devstate_provs);
return -1;
}
}
AST_RWLIST_INSERT_HEAD(&devstate_provs, devprov, list);
AST_RWLIST_UNLOCK(&devstate_provs);