mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-18 15:49:56 +00:00
More debugging and fix it properly
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1294 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -2010,6 +2010,8 @@ static int ast_do_masquerade(struct ast_channel *original)
|
|||||||
/* Signal any blocker */
|
/* Signal any blocker */
|
||||||
if (original->blocking)
|
if (original->blocking)
|
||||||
pthread_kill(original->blocker, SIGURG);
|
pthread_kill(original->blocker, SIGURG);
|
||||||
|
ast_log(LOG_DEBUG, "Done Masquerading %s (%d)\n",
|
||||||
|
original->name, original->_state);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2102,7 +2104,7 @@ int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags
|
|||||||
|
|
||||||
for (/* ever */;;) {
|
for (/* ever */;;) {
|
||||||
/* Stop if we're a zombie or need a soft hangup */
|
/* Stop if we're a zombie or need a soft hangup */
|
||||||
if (c0->zombie || ast_check_hangup(c0) || c1->zombie || ast_check_hangup(c1)) {
|
if (c0->zombie || ast_check_hangup_locked(c0) || c1->zombie || ast_check_hangup_locked(c1)) {
|
||||||
*fo = NULL;
|
*fo = NULL;
|
||||||
if (who) *rc = who;
|
if (who) *rc = who;
|
||||||
res = 0;
|
res = 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user