Merge russell's flag macro patch (with slight mods) (bug #3046)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4469 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-12-16 03:15:20 +00:00
parent da6073e8c6
commit cadb8d010b
5 changed files with 13 additions and 51 deletions

View File

@@ -354,19 +354,6 @@ static struct ast_frame *agent_read(struct ast_channel *ast)
p->acknowledged = 0;
}
}
#if 0
/* I don't know what this code does and was unable to get a hold of Jim to
find out, but it causes chan_agent to crash (see bug #3043) at
http://bugs.digium.com */
if ((!strncmp(p->chan->name,"Zap",3)) && (!p->ackcall) && (!p->acknowledged))
{
p->acknowledged = 1;
f = &answer_frame;
if (p->chan)
p->chan->_bridge = ast;
}
#endif
if (f && (f->frametype == AST_FRAME_CONTROL) && (f->subclass == AST_CONTROL_ANSWER)) {
/* TC */
if (p->ackcall) {