aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-09-09 20:09:23 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-09-09 20:09:23 +0000
commit976abf87cbb0640663b3bb4b43709e03c6448fae (patch)
treeb8c443670ca6893e3884b7c8bdb7f02183f11090
parent12ad49e444d6108b7312a46b389090d51b670a7f (diff)
Merged revisions 285742 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r285742 | qwell | 2010-09-09 15:06:31 -0500 (Thu, 09 Sep 2010) | 9 lines 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) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@285744 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/channel.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c
index 3a4ba57a3..6536944f0 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -4304,6 +4304,8 @@ int ast_readstring_full(struct ast_channel *c, char *s, int len, int timeout, in
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;
@@ -4314,24 +4316,33 @@ int ast_readstring_full(struct ast_channel *c, char *s, int len, int timeout, in
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 AST_GETDATA_FAILED;
+ }
if (d == 0) {
s[pos] = '\0';
+ ast_channel_stop_silence_generator(c, silgen);
return AST_GETDATA_TIMEOUT;
}
if (d == 1) {
s[pos] = '\0';
+ ast_channel_stop_silence_generator(c, silgen);
return AST_GETDATA_INTERRUPTED;
}
if (strchr(enders, d) && (pos == 0)) {
s[pos] = '\0';
+ ast_channel_stop_silence_generator(c, silgen);
return AST_GETDATA_EMPTY_END_TERMINATED;
}
if (!strchr(enders, d)) {
@@ -4339,6 +4350,7 @@ int ast_readstring_full(struct ast_channel *c, char *s, int len, int timeout, in
}
if (strchr(enders, d) || (pos >= len)) {
s[pos] = '\0';
+ ast_channel_stop_silence_generator(c, silgen);
return AST_GETDATA_COMPLETE;
}
to = timeout;