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

Fix a crash in CEL bridge snapshot handling

Browse Source 
Properly search for bridge association structures so that they are
found when expected and handle cases where they don't exist.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@391777 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2013-06-14 16:12:44 +00:00
parent 6f78883214
commit 0abc78dcfd
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/cel.c
View File

@@ -1187,7 +1187,6 @@ static int bridge_match_cb(void *obj, void *arg, int flags)
{ {
struct bridge_assoc *assoc = obj; struct bridge_assoc *assoc = obj;
char *bridge_id = arg; char *bridge_id = arg;
ast_assert(flags & OBJ_KEY);
if (!strcmp(bridge_id, assoc->bridge_id)) { if (!strcmp(bridge_id, assoc->bridge_id)) {
return CMP_MATCH; return CMP_MATCH;
} }
@@ -1197,7 +1196,7 @@ static int bridge_match_cb(void *obj, void *arg, int flags)
static struct bridge_assoc *find_bridge_primary_by_bridge_id(const char *bridge_id) static struct bridge_assoc *find_bridge_primary_by_bridge_id(const char *bridge_id)
{ {
char *dup_id = ast_strdupa(bridge_id); char *dup_id = ast_strdupa(bridge_id);
return ao2_callback(bridge_primaries, OBJ_KEY, bridge_match_cb, dup_id); return ao2_callback(bridge_primaries, 0, bridge_match_cb, dup_id);
} }
static void clear_bridge_primary(const char *bridge_id) static void clear_bridge_primary(const char *bridge_id)
@@ -1251,6 +1250,10 @@ static void cel_snapshot_update_cb(void *data, struct stasis_subscription *sub,
if ((old_snapshot->capabilities & (AST_BRIDGE_CAPABILITY_1TO1MIX | AST_BRIDGE_CAPABILITY_NATIVE)) if ((old_snapshot->capabilities & (AST_BRIDGE_CAPABILITY_1TO1MIX | AST_BRIDGE_CAPABILITY_NATIVE))
&& (new_snapshot->capabilities & AST_BRIDGE_CAPABILITY_MULTIMIX)) { && (new_snapshot->capabilities & AST_BRIDGE_CAPABILITY_MULTIMIX)) {
assoc = find_bridge_primary_by_bridge_id(new_snapshot->uniqueid); assoc = find_bridge_primary_by_bridge_id(new_snapshot->uniqueid);
if (!assoc) {
ast_log(LOG_ERROR, "No association found for bridge %s\n", new_snapshot->uniqueid);
return;
}
/* this bridge will no longer be treated like a bridge, so mark the bridge_assoc as such */ /* this bridge will no longer be treated like a bridge, so mark the bridge_assoc as such */
assoc->track_as_conf = 1; assoc->track_as_conf = 1;