kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-24 06:53:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "main/devicestate: Prevent duplicate registration of device state providers"

Browse Source
This commit is contained in:
Matt Jordan
2015-07-11 11:04:26 -05:00
committed by Gerrit Code Review
parent ec92f91001 f77e688f20
commit dc31b10e2c
1 changed files with 9 additions and 0 deletions
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 */ /*! \brief Add device state provider */
int ast_devstate_prov_add(const char *label, ast_devstate_prov_cb_type callback) int ast_devstate_prov_add(const char *label, ast_devstate_prov_cb_type callback)
{ {
struct devstate_prov *devcb;
struct devstate_prov *devprov; struct devstate_prov *devprov;
if (!callback || !(devprov = ast_calloc(1, sizeof(*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_copy_string(devprov->label, label, sizeof(devprov->label));
AST_RWLIST_WRLOCK(&devstate_provs); 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_INSERT_HEAD(&devstate_provs, devprov, list);
AST_RWLIST_UNLOCK(&devstate_provs); AST_RWLIST_UNLOCK(&devstate_provs);