[Asterisk-cvs] asterisk rtp.c,1.56,1.57

[markster at lists.digium.com]

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

Modified Files:
	rtp.c 
Log Message:
Mute received DTMF path


Index: rtp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/rtp.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- rtp.c	14 Mar 2004 23:12:22 -0000	1.56
+++ rtp.c	15 Mar 2004 16:20:01 -0000	1.57
@@ -75,6 +75,7 @@
 	struct sockaddr_in them;
 	struct timeval rxcore;
 	struct timeval txcore;
+	struct timeval dtmfmute;
 	struct ast_smoother *smoother;
 	int *ioid;
 	unsigned short seqno;
@@ -163,7 +164,17 @@
 
 static struct ast_frame *send_dtmf(struct ast_rtp *rtp)
 {
-	ast_log(LOG_DEBUG, "Sending dtmf: %d (%c)\n", rtp->resp, rtp->resp);
+	struct timeval tv;
+	static struct ast_frame null_frame = { AST_FRAME_NULL, };
+	gettimeofday(&tv, NULL);
+	if ((tv.tv_sec < rtp->dtmfmute.tv_sec) ||
+	    ((tv.tv_sec == rtp->dtmfmute.tv_sec) && (tv.tv_usec < rtp->dtmfmute.tv_usec))) {
+		ast_log(LOG_DEBUG, "Ignore potential DTMF echo from '%s'\n", inet_ntoa(rtp->them.sin_addr));
+		rtp->resp = 0;
+		rtp->dtmfduration = 0;
+		return &null_frame;
+	}
+	ast_log(LOG_DEBUG, "Sending dtmf: %d (%c), at %s\n", rtp->resp, rtp->resp, inet_ntoa(rtp->them.sin_addr));
 	rtp->f.frametype = AST_FRAME_DTMF;
 	rtp->f.subclass = rtp->resp;
 	rtp->f.datalen = 0;
@@ -896,6 +907,13 @@
 	/* If we have no peer, return immediately */	
 	if (!rtp->them.sin_addr.s_addr)
 		return 0;
+
+	gettimeofday(&rtp->dtmfmute, NULL);
+	rtp->dtmfmute.tv_usec += (500 * 1000);
+	if (rtp->dtmfmute.tv_usec > 1000000) {
+		rtp->dtmfmute.tv_usec -= 1000000;
+		rtp->dtmfmute.tv_sec += 1;
+	}
 
 	ms = calc_txstamp(rtp, NULL);
 	/* Default prediction */