From 98c0623f32adfc477d2d452009fa439489816d7d Mon Sep 17 00:00:00 2001 From: file Date: Fri, 8 Sep 2006 18:50:43 +0000 Subject: Swap spies during masquerading git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@42452 f38db490-d61c-443f-a65b-d21fe96a405b --- channel.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/channel.c b/channel.c index 327334390..f53f3d48f 100644 --- a/channel.c +++ b/channel.c @@ -2948,6 +2948,8 @@ int ast_do_masquerade(struct ast_channel *original) void *t_pvt; struct ast_callerid tmpcid; struct ast_channel *clone = original->masq; + struct ast_channel_spy_list *spy_list; + struct ast_channel_spy *spy = NULL; int rformat = original->readformat; int wformat = original->writeformat; char newn[100]; @@ -3025,6 +3027,27 @@ int ast_do_masquerade(struct ast_channel *original) original->rawwriteformat = clone->rawwriteformat; clone->rawwriteformat = x; + /* Swap the spies */ + spy_list = original->spies; + original->spies = clone->spies; + clone->spies = spy_list; + + /* Update channel on respective spy lists if present */ + if (original->spies) { + AST_LIST_TRAVERSE(&original->spies->list, spy, list) { + ast_mutex_lock(&spy->lock); + spy->chan = original; + ast_mutex_unlock(&spy->lock); + } + } + if (clone->spies) { + AST_LIST_TRAVERSE(&clone->spies->list, spy, list) { + ast_mutex_lock(&spy->lock); + spy->chan = clone; + ast_mutex_unlock(&spy->lock); + } + } + /* Save any pending frames on both sides. Start by counting * how many we're going to need... */ prev = NULL; -- cgit v1.2.3