kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 20:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

ast_channel_masquerade: Avoid recursive masquerades.

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.4@287682 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Alec L Davis
2010-09-20 22:57:48 +00:00
parent f2e8c85dfa
commit 17d1b17be5
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
main/channel.c
View File

@@ -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);