From: Joshua Colp <jcolp@digium.com>
Date: Thu, 12 Feb 2009 00:19:30 +0000 (+0000)
Subject: Revert RTP changes for continuation of DTMF. Proxy commit by russell via SMS.
X-Git-Tag: 1.4.24-rc1~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70f7c7e9cbbf4aa0a9828f41bf087b5bea55779e;p=thirdparty%2Fasterisk.git

Revert RTP changes for continuation of DTMF. Proxy commit by russell via SMS.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@174997 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/rtp.c b/main/rtp.c
index b394cf2855..5165ade83c 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -1299,21 +1299,6 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
 	/* Record received timestamp as last received now */
 	rtp->lastrxts = timestamp;
 
-	if (rtp->dtmfcount) {
-		rtp->dtmfcount -= (timestamp - rtp->lastrxts);
-
-		if (rtp->dtmfcount < 0) {
-			rtp->dtmfcount = 0;
-		}
-
-		if (rtp->resp && !rtp->dtmfcount) {
-			struct ast_frame *f;
-			f = send_dtmf(rtp, AST_FRAME_DTMF_END);
-			rtp->resp = 0;
-			return f;
-		}
-	}
-
 	rtp->f.mallocd = 0;
 	rtp->f.datalen = res - hdrlen;
 	rtp->f.data = rtp->rawdata + hdrlen + AST_FRIENDLY_OFFSET;