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

chan_unistim: Fix build failure due to ACL changes.

Browse Source 
Change-Id: I57081045c72b9fcf12d5c84493278f9272c31b32
This commit is contained in:
Joshua Colp
2015-05-05 15:34:43 -03:00
parent bc8dcbdfbc
commit bebf0b9b27
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
channels/chan_unistim.c
View File

@@ -6399,6 +6399,7 @@ static void delete_device(struct unistim_device *d)
{ {
struct unistim_line *l; struct unistim_line *l;
struct unistim_subchannel *sub; struct unistim_subchannel *sub;
struct unistimsession *s;
if (unistimdebug) { if (unistimdebug) {
ast_verb(0, "Removing device '%s'\n", d->name); 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_LOCK(&d->subs);
AST_LIST_TRAVERSE_SAFE_BEGIN(&d->subs, sub, list){ AST_LIST_TRAVERSE_SAFE_BEGIN(&d->subs, sub, list){
if (sub->subtype == SUB_REAL) { 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) { if (sub->owner) {
ast_log(LOG_WARNING, ast_log(LOG_WARNING,
"Device '%s' was not deleted : a call is in progress. Try again later.\n", "Device '%s' was not deleted : a call is in progress. Try again later.\n",
d->name); d->name);
d = d->next; AST_LIST_UNLOCK(&d->subs);
continue; return;
} }
} }
if (sub->subtype == SUB_THREEWAY) { if (sub->subtype == SUB_THREEWAY) {
ast_log(LOG_WARNING, ast_log(LOG_WARNING,
"Device '%s' with threeway call subchannels allocated, aborting.\n", "Device '%s' with threeway call subchannels allocated, aborting.\n",
d->name); d->name);
break; AST_LIST_UNLOCK(&d->subs);
return;
} }
AST_LIST_REMOVE_CURRENT(list); AST_LIST_REMOVE_CURRENT(list);
ast_mutex_destroy(&sub->lock); ast_mutex_destroy(&sub->lock);