diff options
| -rw-r--r-- | channels/chan_unistim.c | 14 | ||||
| -rw-r--r-- | main/manager.c | 3 | ||||
| -rw-r--r-- | pbx/pbx_config.c | 4 | ||||
| -rw-r--r-- | res/ari/resource_bridges.c | 2 |
4 files changed, 11 insertions, 12 deletions
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index 51f811c02..82b3fced9 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -6399,6 +6399,7 @@ static void delete_device(struct unistim_device *d) { struct unistim_line *l; struct unistim_subchannel *sub; + struct unistimsession *s; if (unistimdebug) { ast_verb(0, "Removing device '%s'\n", d->name); @@ -6406,25 +6407,20 @@ static void delete_device(struct unistim_device *d) AST_LIST_LOCK(&d->subs); AST_LIST_TRAVERSE_SAFE_BEGIN(&d->subs, sub, list){ if (sub->subtype == SUB_REAL) { - if (!sub) { - ast_log(LOG_ERROR, "Device '%s' without a subchannel !, aborting\n", - d->name); - ast_config_destroy(cfg); - return 0; - } if (sub->owner) { ast_log(LOG_WARNING, "Device '%s' was not deleted : a call is in progress. Try again later.\n", d->name); - d = d->next; - continue; + AST_LIST_UNLOCK(&d->subs); + return; } } if (sub->subtype == SUB_THREEWAY) { ast_log(LOG_WARNING, "Device '%s' with threeway call subchannels allocated, aborting.\n", d->name); - break; + AST_LIST_UNLOCK(&d->subs); + return; } AST_LIST_REMOVE_CURRENT(list); ast_mutex_destroy(&sub->lock); diff --git a/main/manager.c b/main/manager.c index 846f6e604..17a27384f 100644 --- a/main/manager.c +++ b/main/manager.c @@ -8981,7 +8981,8 @@ static int __init_manager(int reload, int by_external_config) ast_append_acl(var->name, var->value, &user->acl, &acl_error, &acl_subscription_flag); if (acl_error) { - ast_log(LOG_ERROR, "Invalid ACL '%s' for manager user '%s' on line %d. Deleting user\n"); + ast_log(LOG_ERROR, "Invalid ACL '%s' for manager user '%s' on line %d. Deleting user\n", + var->value, user->username, var->lineno); user->keep = 0; } } else if (!strcasecmp(var->name, "read") ) { diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 92462bf17..09941a6d5 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -2080,9 +2080,9 @@ static int load_module(void) ast_cli_register(&cli_dialplan_save); ast_cli_register_multiple(cli_pbx_config, ARRAY_LEN(cli_pbx_config)); - res = ast_manager_register_xml_core(AMI_EXTENSION_ADD, + res = ast_manager_register_xml(AMI_EXTENSION_ADD, EVENT_FLAG_SYSTEM, manager_dialplan_extension_add); - res |= ast_manager_register_xml_core(AMI_EXTENSION_REMOVE, + res |= ast_manager_register_xml(AMI_EXTENSION_REMOVE, EVENT_FLAG_SYSTEM, manager_dialplan_extension_remove); if (res) { diff --git a/res/ari/resource_bridges.c b/res/ari/resource_bridges.c index 70365ec6d..7b9b94665 100644 --- a/res/ari/resource_bridges.c +++ b/res/ari/resource_bridges.c @@ -24,6 +24,8 @@ */ /*** MODULEINFO + <depend type="module">res_stasis_recording</depend> + <depend type="module">res_stasis_playback</depend> <support_level>core</support_level> ***/ |