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

Merge "res_stasis: Fix app_is_subscribed_bridge_id." into 13

Browse Source
This commit is contained in:
Jenkins2
2018-01-08 11:13:21 -06:00
committed by Gerrit Code Review
parent b6b1d73cb5 c1acc4f364
commit 7cc614d223
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/stasis/app.c
View File

@@ -1432,25 +1432,15 @@ int app_unsubscribe_bridge_id(struct stasis_app *app, const char *bridge_id)
int app_is_subscribed_bridge_id(struct stasis_app *app, const char *bridge_id) int app_is_subscribed_bridge_id(struct stasis_app *app, const char *bridge_id)
{ {
struct app_forwards *forwards; struct app_forwards *forwards;
SCOPED_AO2LOCK(lock, app->forwards);
forwards = ao2_find(app->forwards, BRIDGE_ALL, OBJ_SEARCH_KEY | OBJ_NOLOCK);
if (forwards) {
ao2_ref(forwards, -1);
return 1;
}
if (ast_strlen_zero(bridge_id)) { if (ast_strlen_zero(bridge_id)) {
bridge_id = BRIDGE_ALL; bridge_id = BRIDGE_ALL;
} }
forwards = ao2_find(app->forwards, bridge_id, OBJ_SEARCH_KEY | OBJ_NOLOCK); forwards = ao2_find(app->forwards, bridge_id, OBJ_SEARCH_KEY);
if (forwards) { ao2_cleanup(forwards);
ao2_ref(forwards, -1);
return 1;
}
return 0; return forwards != NULL;
} }
static void *bridge_find(const struct stasis_app *app, const char *id) static void *bridge_find(const struct stasis_app *app, const char *id)