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

Make sure we safely lock both channels when doing a masquerade.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2716 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-04-20 03:16:01 +00:00
parent 50edb67fc4
commit b54d2b2c38
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
channel.c
View File

@@ -1996,26 +1996,32 @@ int ast_channel_make_compatible(struct ast_channel *chan, struct ast_channel *pe
int ast_channel_masquerade(struct ast_channel *original, struct ast_channel *clone) int ast_channel_masquerade(struct ast_channel *original, struct ast_channel *clone)
{ {
struct ast_frame null = { AST_FRAME_NULL, }; struct ast_frame null = { AST_FRAME_NULL, };
int res = -1;
ast_mutex_lock(&original->lock);
while(ast_mutex_trylock(&clone->lock)) {
ast_mutex_unlock(&original->lock);
usleep(1);
ast_mutex_lock(&original->lock);
}
ast_log(LOG_DEBUG, "Planning to masquerade %s into the structure of %s\n", ast_log(LOG_DEBUG, "Planning to masquerade %s into the structure of %s\n",
clone->name, original->name); clone->name, original->name);
if (original->masq) { if (original->masq) {
ast_log(LOG_WARNING, "%s is already going to masquerade as %s\n", ast_log(LOG_WARNING, "%s is already going to masquerade as %s\n",
original->masq->name, original->name); original->masq->name, original->name);
return -1; } else if (clone->masqr) {
}
if (clone->masqr) {
ast_log(LOG_WARNING, "%s is already going to masquerade as %s\n", ast_log(LOG_WARNING, "%s is already going to masquerade as %s\n",
clone->name, clone->masqr->name); clone->name, clone->masqr->name);
return -1; } else {
original->masq = clone;
clone->masqr = original;
ast_queue_frame(original, &null);
ast_queue_frame(clone, &null);
ast_log(LOG_DEBUG, "Done planning to masquerade %s into the structure of %s\n", original->name, clone->name);
res = 0;
} }
original->masq = clone; ast_mutex_unlock(&clone->lock);
clone->masqr = original; ast_mutex_unlock(&original->lock);
/* XXX can't really hold the lock here, but at the same time, it' s return res;
not really safe not to XXX */
ast_queue_frame(original, &null);
ast_queue_frame(clone, &null);
ast_log(LOG_DEBUG, "Done planning to masquerade %s into the structure of %s\n", original->name, clone->name);
return 0;
} }
void ast_change_name(struct ast_channel *chan, char *newname) void ast_change_name(struct ast_channel *chan, char *newname)