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

Fix lock errors on startup.

Browse Source 
In messages.c, there are several places in the code where we create a
tmp_tech_holder and pass that into an ao2_find call. Unfortunately, we
weren't initializing the rwlock on the tmp_tech_holder, which the hash
function was locking. It's apparently harmless, but still not the best
code.

This patch extracts all that copy/pasted code into two functions,
msg_find_by_tech and msg_find_by_tech_name, which properly initialize
and destroy the rwlock on the tmp_tech_holder.

Review: https://reviewboard.asterisk.org/r/2454/



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@386006 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David M. Lee
2013-04-18 16:07:03 +00:00
parent f49c09b8e5
commit 42d2f385af
1 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
main/message.c
View File

@@ -1041,6 +1041,27 @@ static int msg_tech_cmp(void *obj, void *arg, int flags)
return res; return res;
} }
static struct ast_msg_tech_holder *msg_find_by_tech(const struct ast_msg_tech *msg_tech, int ao2_flags)
{
struct ast_msg_tech_holder *tech_holder;
struct ast_msg_tech_holder tmp_tech_holder = {
.tech = msg_tech,
};
ast_rwlock_init(&tmp_tech_holder.tech_lock);
tech_holder = ao2_find(msg_techs, &tmp_tech_holder, ao2_flags);
ast_rwlock_destroy(&tmp_tech_holder.tech_lock);
return tech_holder;
}
static struct ast_msg_tech_holder *msg_find_by_tech_name(const char *tech_name, int ao2_flags)
{
struct ast_msg_tech tmp_msg_tech = {
.name = tech_name,
};
return msg_find_by_tech(&tmp_msg_tech, ao2_flags);
}
/*! /*!
* \internal * \internal
* \brief MessageSend() application * \brief MessageSend() application
@@ -1089,16 +1110,7 @@ static int msg_send_exec(struct ast_channel *chan, const char *data)
tech_name = ast_strdupa(args.to); tech_name = ast_strdupa(args.to);
tech_name = strsep(&tech_name, ":"); tech_name = strsep(&tech_name, ":");
{ tech_holder = msg_find_by_tech_name(tech_name, OBJ_POINTER);
struct ast_msg_tech tmp_msg_tech = {
.name = tech_name,
};
struct ast_msg_tech_holder tmp_tech_holder = {
.tech = &tmp_msg_tech,
};
tech_holder = ao2_find(msg_techs, &tmp_tech_holder, OBJ_POINTER);
}
if (!tech_holder) { if (!tech_holder) {
ast_log(LOG_WARNING, "No message technology '%s' found.\n", tech_name); ast_log(LOG_WARNING, "No message technology '%s' found.\n", tech_name);
@@ -1159,16 +1171,8 @@ static int action_messagesend(struct mansession *s, const struct message *m)
tech_name = ast_strdupa(to); tech_name = ast_strdupa(to);
tech_name = strsep(&tech_name, ":"); tech_name = strsep(&tech_name, ":");
{
struct ast_msg_tech tmp_msg_tech = {
.name = tech_name,
};
struct ast_msg_tech_holder tmp_tech_holder = {
.tech = &tmp_msg_tech,
};
tech_holder = ao2_find(msg_techs, &tmp_tech_holder, OBJ_POINTER); tech_holder = msg_find_by_tech_name(tech_name, OBJ_POINTER);
}
if (!tech_holder) { if (!tech_holder) {
astman_send_error(s, m, "Message technology not found."); astman_send_error(s, m, "Message technology not found.");
@@ -1219,16 +1223,8 @@ int ast_msg_send(struct ast_msg *msg, const char *to, const char *from)
tech_name = ast_strdupa(to); tech_name = ast_strdupa(to);
tech_name = strsep(&tech_name, ":"); tech_name = strsep(&tech_name, ":");
{
struct ast_msg_tech tmp_msg_tech = {
.name = tech_name,
};
struct ast_msg_tech_holder tmp_tech_holder = {
.tech = &tmp_msg_tech,
};
tech_holder = ao2_find(msg_techs, &tmp_tech_holder, OBJ_POINTER); tech_holder = msg_find_by_tech_name(tech_name, OBJ_POINTER);
}
if (!tech_holder) { if (!tech_holder) {
ao2_ref(msg, -1); ao2_ref(msg, -1);
@@ -1249,12 +1245,9 @@ int ast_msg_send(struct ast_msg *msg, const char *to, const char *from)
int ast_msg_tech_register(const struct ast_msg_tech *tech) int ast_msg_tech_register(const struct ast_msg_tech *tech)
{ {
struct ast_msg_tech_holder tmp_tech_holder = {
.tech = tech,
};
struct ast_msg_tech_holder *tech_holder; struct ast_msg_tech_holder *tech_holder;
if ((tech_holder = ao2_find(msg_techs, &tmp_tech_holder, OBJ_POINTER))) { if ((tech_holder = msg_find_by_tech(tech, OBJ_POINTER))) {
ao2_ref(tech_holder, -1); ao2_ref(tech_holder, -1);
ast_log(LOG_ERROR, "Message technology already registered for '%s'\n", ast_log(LOG_ERROR, "Message technology already registered for '%s'\n",
tech->name); tech->name);
@@ -1280,12 +1273,9 @@ int ast_msg_tech_register(const struct ast_msg_tech *tech)
int ast_msg_tech_unregister(const struct ast_msg_tech *tech) int ast_msg_tech_unregister(const struct ast_msg_tech *tech)
{ {
struct ast_msg_tech_holder tmp_tech_holder = {
.tech = tech,
};
struct ast_msg_tech_holder *tech_holder; struct ast_msg_tech_holder *tech_holder;
tech_holder = ao2_find(msg_techs, &tmp_tech_holder, OBJ_POINTER | OBJ_UNLINK); tech_holder = msg_find_by_tech(tech, OBJ_POINTER | OBJ_UNLINK);
if (!tech_holder) { if (!tech_holder) {
ast_log(LOG_ERROR, "No '%s' message technology found.\n", tech->name); ast_log(LOG_ERROR, "No '%s' message technology found.\n", tech->name);