From ea303a5b513d43aa488bd6b3281d15255398db2f Mon Sep 17 00:00:00 2001 From: alecdavis Date: Mon, 20 Sep 2010 22:57:48 +0000 Subject: ast_channel_masquerade: Avoid recursive masquerades. Check all 4 combinations of (original/clonechan) * (masq/masqr). Initially original->masq and clonechan->masqr were only checked. It's possible with multiple masq's planned - and not yet executed, that the 'original' chan could already have another masq'd into it - thus original->masqr would be set, that masqr would lost. Likewise for the clonechan->masq. (closes issue #16057;#17363) Reported by: amorsen;davidw,alecdavis Patches: bug16057.diff4.txt uploaded by alecdavis (license 585) Tested by: ramonpeek, davidw, alecdavis git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@287682 f38db490-d61c-443f-a65b-d21fe96a405b --- main/channel.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'main') diff --git a/main/channel.c b/main/channel.c index bc8ec1755..24e9f9c86 100644 --- a/main/channel.c +++ b/main/channel.c @@ -3911,13 +3911,8 @@ retrymasq: if (option_debug) ast_log(LOG_DEBUG, "Planning to masquerade channel %s into the structure of %s\n", clone->name, original->name); - if (original->masq) { - ast_log(LOG_WARNING, "%s is already going to masquerade as %s\n", - original->masq->name, original->name); - } else if (clone->masqr) { - ast_log(LOG_WARNING, "%s is already going to masquerade as %s\n", - clone->name, clone->masqr->name); - } else { + + if (!original->masqr && !original->masq && !clone->masq && !clone->masqr) { original->masq = clone; clone->masqr = original; ast_queue_frame(original, &ast_null_frame); @@ -3925,6 +3920,21 @@ retrymasq: if (option_debug) ast_log(LOG_DEBUG, "Done planning to masquerade channel %s into the structure of %s\n", clone->name, original->name); res = 0; + + } else if (original->masq) { + ast_log(LOG_WARNING, "%s is already going to masquerade as %s\n", + original->masq->name, original->name); + } else if (original->masqr) { + /* not yet as a previously planned masq hasn't yet happened */ + ast_log(LOG_WARNING, "%s is already going to masquerade as %s\n", + original->name, original->masqr->name); + } else if (clone->masq) { + ast_log(LOG_WARNING, "%s is already going to masquerade as %s\n", + clone->masq->name, clone->name); + } else if (clone->masqr) { + ast_log(LOG_WARNING, "%s is already going to masquerade as %s\n", + clone->name, clone->masqr->name); + } else { } ast_channel_unlock(clone); -- cgit v1.2.3