kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_pjsip_pubsub.c: Fix body generator registration race." into 13

Browse Source
This commit is contained in:
zuul
2016-04-29 13:06:27 -05:00
committed by Gerrit Code Review
parent 72ee8c1bf9 f9e416f053
commit 3e5666eadc
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
res/res_pjsip_pubsub.c
View File

@@ -2541,20 +2541,28 @@ void ast_sip_unregister_subscription_handler(struct ast_sip_subscription_handler
AST_RWLIST_TRAVERSE_SAFE_END; AST_RWLIST_TRAVERSE_SAFE_END;
} }
static struct ast_sip_pubsub_body_generator *find_body_generator_type_subtype(const char *content_type, static struct ast_sip_pubsub_body_generator *find_body_generator_type_subtype_nolock(const char *type, const char *subtype)
const char *content_subtype)
{ {
struct ast_sip_pubsub_body_generator *iter; struct ast_sip_pubsub_body_generator *gen;
SCOPED_LOCK(lock, &body_generators, AST_RWLIST_RDLOCK, AST_RWLIST_UNLOCK);
AST_LIST_TRAVERSE(&body_generators, iter, list) { AST_LIST_TRAVERSE(&body_generators, gen, list) {
if (!strcmp(iter->type, content_type) && if (!strcmp(gen->type, type)
!strcmp(iter->subtype, content_subtype)) { && !strcmp(gen->subtype, subtype)) {
break; break;
} }
}; }
return iter; return gen;
}
static struct ast_sip_pubsub_body_generator *find_body_generator_type_subtype(const char *type, const char *subtype)
{
struct ast_sip_pubsub_body_generator *gen;
AST_RWLIST_RDLOCK(&body_generators);
gen = find_body_generator_type_subtype_nolock(type, subtype);
AST_RWLIST_UNLOCK(&body_generators);
return gen;
} }
static struct ast_sip_pubsub_body_generator *find_body_generator_accept(const char *accept) static struct ast_sip_pubsub_body_generator *find_body_generator_accept(const char *accept)
@@ -3092,14 +3100,14 @@ int ast_sip_pubsub_register_body_generator(struct ast_sip_pubsub_body_generator
pj_str_t accept; pj_str_t accept;
pj_size_t accept_len; pj_size_t accept_len;
existing = find_body_generator_type_subtype(generator->type, generator->subtype); AST_RWLIST_WRLOCK(&body_generators);
existing = find_body_generator_type_subtype_nolock(generator->type, generator->subtype);
if (existing) { if (existing) {
ast_log(LOG_WARNING, "Cannot register body generator of %s/%s." AST_RWLIST_UNLOCK(&body_generators);
"One is already registered.\n", generator->type, generator->subtype); ast_log(LOG_WARNING, "A body generator for %s/%s is already registered.\n",
generator->type, generator->subtype);
return -1; return -1;
} }
AST_RWLIST_WRLOCK(&body_generators);
AST_LIST_INSERT_HEAD(&body_generators, generator, list); AST_LIST_INSERT_HEAD(&body_generators, generator, list);
AST_RWLIST_UNLOCK(&body_generators); AST_RWLIST_UNLOCK(&body_generators);