[asterisk-commits] russell: branch russell/autoservice-nochans-1.4 r105562 - in /team/russell/au...

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Mar  3 09:33:14 2008
New Revision: 105562

URL: http://svn.digium.com/view/asterisk?view=rev&rev=105562
Log:
sync with 1.4 branch

Modified:
    team/russell/autoservice-nochans-1.4/   (props changed)
    team/russell/autoservice-nochans-1.4/channels/chan_sip.c
    team/russell/autoservice-nochans-1.4/main/channel.c

Propchange: team/russell/autoservice-nochans-1.4/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Mar  3 09:33:14 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-105550
+/branches/1.4:1-105561

Modified: team/russell/autoservice-nochans-1.4/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/russell/autoservice-nochans-1.4/channels/chan_sip.c?view=diff&rev=105562&r1=105561&r2=105562
==============================================================================
--- team/russell/autoservice-nochans-1.4/channels/chan_sip.c (original)
+++ team/russell/autoservice-nochans-1.4/channels/chan_sip.c Mon Mar  3 09:33:14 2008
@@ -16327,6 +16327,7 @@
 	strcpy(user->language, default_language);
 	strcpy(user->mohinterpret, default_mohinterpret);
 	strcpy(user->mohsuggest, default_mohsuggest);
+	/* First we walk through the v parameters list and then the alt parameters list */
 	for (; v || ((v = alt) && !(alt=NULL)); v = v->next) {
 		if (handle_common_options(&userflags[0], &mask[0], v))
 			continue;

Modified: team/russell/autoservice-nochans-1.4/main/channel.c
URL: http://svn.digium.com/view/asterisk/team/russell/autoservice-nochans-1.4/main/channel.c?view=diff&rev=105562&r1=105561&r2=105562
==============================================================================
--- team/russell/autoservice-nochans-1.4/main/channel.c (original)
+++ team/russell/autoservice-nochans-1.4/main/channel.c Mon Mar  3 09:33:14 2008
@@ -2167,9 +2167,16 @@
 			}
 			break;
 		case AST_FRAME_NULL:
+			/* The EMULATE_DTMF flag must be cleared here as opposed to when the duration
+			 * is reached , because we want to make sure we pass at least one
+			 * voice frame through before starting the next digit, to ensure a gap
+			 * between DTMF digits. */
 			if (ast_test_flag(chan, AST_FLAG_EMULATE_DTMF)) {
 				struct timeval now = ast_tvnow();
-				if (ast_tvdiff_ms(now, chan->dtmf_tv) >= chan->emulate_dtmf_duration) {
+				if (!chan->emulate_dtmf_duration) {
+					ast_clear_flag(chan, AST_FLAG_EMULATE_DTMF);
+					chan->emulate_dtmf_digit = 0;
+				} else if (ast_tvdiff_ms(now, chan->dtmf_tv) >= chan->emulate_dtmf_duration) {
 					chan->emulate_dtmf_duration = 0;
 					ast_frfree(f);
 					f = &chan->dtmff;