diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-23 20:53:27 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-23 20:53:27 +0000 |
commit | f7fd994000ed9c1ec0af70f6287eb08cd1017786 (patch) | |
tree | 8a763419d56e7849476762a28f4e79b7ebe7fa5b /apps | |
parent | 281108bceb7f52a232de33c0656ab68ade6d49e1 (diff) |
Merged revisions 114598 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r114598 | russell | 2008-04-23 15:53:05 -0500 (Wed, 23 Apr 2008) | 18 lines
Merged revisions 114597 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114597 | russell | 2008-04-23 15:49:18 -0500 (Wed, 23 Apr 2008) | 10 lines
Fix an issue that caused getting the correct next channel to not always work.
Also, remove setting the amount of time to wait for a digit from 5 seconds back
down to 1/10 of a second. I believe this was so the beep didn't get played over
and over really fast, but a while back I put in another fix for that issue.
(closes issue #12498)
Reported by: jsmith
Patches:
app_chanspy_channel_walk.trunk.patch uploaded by jsmith (license 15)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114599 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_chanspy.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index df06f5c44..0561b542d 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -700,12 +700,11 @@ static int common_exec(struct ast_channel *chan, const struct ast_flags *flags, for (s = peer_name; s < ptr; s++) *s = tolower(*s); - /* We have to unlock the peer channel here to avoid a deadlock. - * So, when we need it again, we have to lock the datastore and get - * the pointer from there to see if the channel is still valid. */ + * So, when we need to dereference it again, we have to lock the + * datastore and get the pointer from there to see if the channel + * is still valid. */ ast_channel_unlock(peer); - peer = NULL; if (!ast_test_flag(flags, OPTION_QUIET)) { if (ast_fileexists(peer_name, NULL, NULL) != -1) { @@ -722,7 +721,6 @@ static int common_exec(struct ast_channel *chan, const struct ast_flags *flags, ast_say_digits(chan, atoi(ptr), "", chan->language); } - waitms = 5000; res = channel_spy(chan, peer_chanspy_ds, &volfactor, fd, flags, exitcontext); num_spyed_upon++; |