[Asterisk-cvs] asterisk channel.c,1.136,1.137

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv12709

Modified Files:
	channel.c 
Log Message:
Fix "duplicate answer" issue (bug #2342)


Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- channel.c	31 Aug 2004 17:30:46 -0000	1.136
+++ channel.c	2 Sep 2004 13:48:11 -0000	1.137
@@ -1359,6 +1359,10 @@
 			ast_log(LOG_WARNING, "Dropping deferred DTMF digits on %s\n", chan->name);
 		f = &null_frame;
 	} else if ((f->frametype == AST_FRAME_CONTROL) && (f->subclass == AST_CONTROL_ANSWER)) {
+		if (chan->_state == AST_STATE_UP) {
+			ast_log(LOG_DEBUG, "Dropping duplicate answer!\n");
+			f = &null_frame;
+		}
 		/* Answer the CDR */
 		ast_setstate(chan, AST_STATE_UP);
 		ast_cdr_answer(chan->cdr);