kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 15:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43516 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-09-22 22:01:20 +00:00
parent bb63a367e3
commit c5056e1736
2 changed files with 82 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
apps/app_chanspy.c
View File

@@ -237,17 +237,15 @@ static void set_volume(struct ast_channel *chan, struct chanspy_translation_help
static int channel_spy(struct ast_channel *chan, struct ast_channel *spyee, int *volfactor, int fd)
{
struct chanspy_translation_helper csth;
int running, res = 0, x = 0;
char inp[24];
char *name=NULL;
struct ast_frame *f;
int running = 0, res = 0, x = 0;
char inp[24] = "", *name = NULL;
struct ast_frame *f = NULL;
running = (chan && !ast_check_hangup(chan) && spyee && !ast_check_hangup(spyee));
if ((chan && ast_check_hangup(chan)) || (spyee && ast_check_hangup(spyee)))
return 0;
if (running) {
memset(inp, 0, sizeof(inp));
name = ast_strdupa(spyee->name);
if (option_verbose >= 2)
if (option_verbose > 1)
ast_verbose(VERBOSE_PREFIX_2 "Spying on channel %s\n", name);
memset(&csth, 0, sizeof(csth));
@@ -265,78 +263,72 @@ static int channel_spy(struct ast_channel *chan, struct ast_channel *spyee, int
csth.spy.write_vol_adjustment = csth.volfactor;
csth.fd = fd;
if (start_spying(spyee, chan, &csth.spy))
running = 0;
if (start_spying(spyee, chan, &csth.spy)) {
ast_channel_spy_free(&csth.spy);
return 0;
}
if (running) {
running = 1;
ast_activate_generator(chan, &spygen, &csth);
while (csth.spy.status == CHANSPY_RUNNING &&
chan && !ast_check_hangup(chan) &&
spyee &&
!ast_check_hangup(spyee) &&
running == 1 &&
(res = ast_waitfor(chan, -1) > -1)) {
if ((f = ast_read(chan))) {
res = 0;
if (f->frametype == AST_FRAME_DTMF) {
res = f->subclass;
}
ast_frfree(f);
if (!res) {
continue;
}
} else {
/* Read in frame from channel, break out if no frame */
if (!(f = ast_read(chan)))
break;
}
if (x == sizeof(inp)) {
/* Now if this is DTMF then we have to handle it as such, otherwise just skip it */
res = 0;
if (f->frametype == AST_FRAME_DTMF)
res = f->subclass;
ast_frfree(f);
if (!res)
continue;
if (x == sizeof(inp))
x = 0;
}
if (res < 0) {
running = -1;
break;
}
if (res == 0) {
continue;
} else if (res == '*') {
running = 0;
} else if (res == '#') {
/* Process DTMF digits */
if (res == '#') {
if (!ast_strlen_zero(inp)) {
running = x ? atoi(inp) : -1;
break;
} else {
(*volfactor)++;
if (*volfactor > 4) {
*volfactor = -4;
}
if (option_verbose > 2) {
if (*volfactor > 4)
*volfactor = -1;
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Setting spy volume on %s to %d\n", chan->name, *volfactor);
}
csth.volfactor = *volfactor;
set_volume(chan, &csth);
csth.spy.read_vol_adjustment = csth.volfactor;
csth.spy.write_vol_adjustment = csth.volfactor;
}
} else if (res == '*') {
break;
} else if (res >= 48 && res <= 57) {
inp[x++] = res;
}
}
ast_deactivate_generator(chan);
ast_mutex_lock(&csth.spy.lock);
if (csth.spy.chan) {
csth.spy.status = CHANSPY_DONE;
ast_mutex_lock(&csth.spy.chan->lock);
ast_channel_spy_remove(csth.spy.chan, &csth.spy);
ast_mutex_unlock(&csth.spy.chan->lock);
}
ast_mutex_unlock(&csth.spy.lock);
if (option_verbose >= 2) {
if (option_verbose > 1)
ast_verbose(VERBOSE_PREFIX_2 "Done Spying on channel %s\n", name);
}
} else {
running = 0;
}
ast_channel_spy_free(&csth.spy);

2
channel.c
View File

@@ -1020,7 +1020,7 @@ int ast_channel_spy_add(struct ast_channel *chan, struct ast_channel_spy *spy)
/* Clean up a channel's spy information */
static void spy_cleanup(struct ast_channel *chan)
{
if (AST_LIST_EMPTY(&chan->spies->list))
if (AST_LIST_FIRST(&chan->spies->list))
return;
if (chan->spies->read_translator.path)
ast_translator_free_path(chan->spies->read_translator.path);