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

Fix some substantial locking issues

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1236 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-07-29 16:09:03 +00:00
parent 34b28107e2
commit 7a6ec6b25a
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
channel.c
View File

@@ -816,13 +816,16 @@ struct ast_channel *ast_waitfor_nandfds(struct ast_channel **c, int n, int *fds,
/* Perform any pending masquerades */ /* Perform any pending masquerades */
for (x=0;x<n;x++) { for (x=0;x<n;x++) {
ast_pthread_mutex_lock(&c[x]->lock);
if (c[x]->masq) { if (c[x]->masq) {
if (ast_do_masquerade(c[x])) { if (ast_do_masquerade(c[x])) {
ast_log(LOG_WARNING, "Masquerade failed\n"); ast_log(LOG_WARNING, "Masquerade failed\n");
*ms = -1; *ms = -1;
ast_pthread_mutex_unlock(&c[x]->lock);
return NULL; return NULL;
} }
} }
ast_pthread_mutex_unlock(&c[x]->lock);
} }
tv.tv_sec = *ms / 1000; tv.tv_sec = *ms / 1000;
@@ -1309,22 +1312,30 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr)
int res = -1; int res = -1;
struct ast_frame *f = NULL; struct ast_frame *f = NULL;
/* Stop if we're a zombie or need a soft hangup */ /* Stop if we're a zombie or need a soft hangup */
if (chan->zombie || ast_check_hangup(chan)) ast_pthread_mutex_lock(&chan->lock);
if (chan->zombie || ast_check_hangup(chan)) {
ast_pthread_mutex_unlock(&chan->lock);
return -1; return -1;
}
/* Handle any pending masquerades */ /* Handle any pending masquerades */
if (chan->masq) { if (chan->masq) {
if (ast_do_masquerade(chan)) { if (ast_do_masquerade(chan)) {
ast_log(LOG_WARNING, "Failed to perform masquerade\n"); ast_log(LOG_WARNING, "Failed to perform masquerade\n");
ast_pthread_mutex_unlock(&chan->lock);
return -1; return -1;
} }
} }
if (chan->masqr) if (chan->masqr) {
ast_pthread_mutex_unlock(&chan->lock);
return 0; return 0;
}
if (chan->generatordata) { if (chan->generatordata) {
if (chan->writeinterrupt) if (chan->writeinterrupt)
ast_deactivate_generator(chan); ast_deactivate_generator(chan);
else else {
ast_pthread_mutex_unlock(&chan->lock);
return 0; return 0;
}
} }
if (chan->fout & 0x80000000) if (chan->fout & 0x80000000)
ast_frame_dump(chan->name, fr, ">>"); ast_frame_dump(chan->name, fr, ">>");
@@ -1382,6 +1393,7 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr)
chan->fout++; chan->fout++;
chan->fout++; chan->fout++;
} }
ast_pthread_mutex_unlock(&chan->lock);
return res; return res;
} }