[asterisk-commits] qwell: trunk r51171 - in /trunk: ./ main/rtp.c

[asterisk-commits at lists.digium.com]

Author: qwell
Date: Tue Jan 16 18:22:20 2007
New Revision: 51171

URL: http://svn.digium.com/view/asterisk?view=rev&rev=51171
Log:
Merged revisions 51170 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r51170 | qwell | 2007-01-16 18:20:56 -0600 (Tue, 16 Jan 2007) | 4 lines

Fix issue with dtmf continuation packets when the dtmf digit is 0...

Issue 8831

........

Modified:
    trunk/   (props changed)
    trunk/main/rtp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/rtp.c?view=diff&rev=51171&r1=51170&r2=51171
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Tue Jan 16 18:22:20 2007
@@ -143,7 +143,8 @@
 	unsigned int dtmfduration;
 	/* DTMF Transmission Variables */
 	unsigned int lastdigitts;
-	char send_digit;
+	char sending_digit;	/* boolean - are we sending digits */
+	char send_digit;	/* digit we are sending */
 	int send_payload;
 	int send_duration;
 	int nat;
@@ -1142,7 +1143,7 @@
 	struct ast_rtp *bridged = NULL;
 	
 	/* If time is up, kill it */
-	if (rtp->send_digit)
+	if (rtp->sending_digit)
 		ast_rtp_senddigit_continuation(rtp);
 
 	len = sizeof(sin);
@@ -2203,6 +2204,7 @@
 	}
 
 	/* Since we received a begin, we can safely store the digit and disable any compensation */
+	rtp->sending_digit = 1;
 	rtp->send_digit = digit;
 	rtp->send_payload = payload;
 
@@ -2294,6 +2296,7 @@
 				    ast_inet_ntoa(rtp->them.sin_addr),
 				    ntohs(rtp->them.sin_port), rtp->send_payload, rtp->seqno, rtp->lastdigitts, res - hdrlen);
 	}
+	rtp->sending_digit = 0;
 	rtp->send_digit = 0;
 	/* Increment lastdigitts */
 	rtp->lastdigitts += 960;