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

diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 70365996e1830e4a6400225f476b37fc1b8661d9..e0377d35f83d22ab5211280bc6866f7b7ce77e2a 100644 (file)
--- 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;