dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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: http://svn.digium.com/svn/asterisk/trunk@104788 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
file 2008-02-27 21:02:08 +00:00
parent 2a017cb36c
commit 002278a62c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/app_chanspy.c
View File

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