[svn-commits] qwell: branch 1.4 r285742 - /branches/1.4/main/channel.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Thu Sep  9 15:06:31 2010
New Revision: 285742

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=285742
Log:
Transmit silence when reading DTMF in ast_readstring.

Otherwise, you could get issues with DTMF timeouts causing hangups.

(closes issue #17370)
Reported by: makoto
Patches: 
      channel-readstring-silence-generator.patch uploaded by makoto (license 38)

Modified:
    branches/1.4/main/channel.c

Modified: branches/1.4/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/channel.c?view=diff&rev=285742&r1=285741&r2=285742
==============================================================================
--- branches/1.4/main/channel.c (original)
+++ branches/1.4/main/channel.c Thu Sep  9 15:06:31 2010
@@ -3722,6 +3722,8 @@
 	int pos = 0;	/* index in the buffer where we accumulate digits */
 	int to = ftimeout;
 
+	struct ast_silence_generator *silgen = NULL;
+
 	/* Stop if we're a zombie or need a soft hangup */
 	if (ast_test_flag(c, AST_FLAG_ZOMBIE) || ast_check_hangup(c))
 		return -1;
@@ -3732,26 +3734,35 @@
 		if (c->stream) {
 			d = ast_waitstream_full(c, AST_DIGIT_ANY, audiofd, ctrlfd);
 			ast_stopstream(c);
+			if (!silgen && ast_opt_transmit_silence)
+				silgen = ast_channel_start_silence_generator(c);
 			usleep(1000);
 			if (!d)
 				d = ast_waitfordigit_full(c, to, audiofd, ctrlfd);
 		} else {
+			if (!silgen && ast_opt_transmit_silence)
+				silgen = ast_channel_start_silence_generator(c);
 			d = ast_waitfordigit_full(c, to, audiofd, ctrlfd);
 		}
-		if (d < 0)
+		if (d < 0) {
+			ast_channel_stop_silence_generator(c, silgen);
 			return -1;
+		}
 		if (d == 0) {
 			s[pos]='\0';
+			ast_channel_stop_silence_generator(c, silgen);
 			return 1;
 		}
 		if (d == 1) {
 			s[pos]='\0';
+			ast_channel_stop_silence_generator(c, silgen);
 			return 2;
 		}
 		if (!strchr(enders, d))
 			s[pos++] = d;
 		if (strchr(enders, d) || (pos >= len)) {
 			s[pos]='\0';
+			ast_channel_stop_silence_generator(c, silgen);
 			return 0;
 		}
 		to = timeout;