From 9080a65bec76c317ec8f7e789a2dc40bca2200d7 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Wed, 27 Feb 2008 21:02:08 +0000 Subject: Merged revisions 104787 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r104787 | file | 2008-02-27 16:56:23 -0400 (Wed, 27 Feb 2008) | 2 lines Don't loop around infinitely trying to spy on our own channel, and don't forget to free/detach the datastore upon hangup of the spy. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@104788 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_chanspy.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'apps/app_chanspy.c') diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 70365996e..e0377d35f 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -500,6 +500,10 @@ redo: if (!strncmp(this->name, "Zap/pseudo", 10)) { ast_channel_unlock(this); goto redo; + } else if (this == chan) { + last = this; + ast_channel_unlock(this); + goto redo; } return setup_chanspy_ds(this, chanspy_ds); @@ -616,11 +620,6 @@ static int common_exec(struct ast_channel *chan, const struct ast_flags *flags, break; } - if (peer == chan) { - ast_channel_unlock(peer); - continue; - } - if (ast_test_flag(flags, OPTION_BRIDGED) && !ast_bridged_channel(peer)) { ast_channel_unlock(peer); continue; @@ -714,6 +713,7 @@ static int common_exec(struct ast_channel *chan, const struct ast_flags *flags, num_spyed_upon++; if (res == -1) { + chanspy_ds_free(peer_chanspy_ds); goto exit; } else if (res == -2) { res = 0; -- cgit v1.2.3