Use digit/response timeouts
authorMark Spencer <markster@digium.com>
Wed, 11 Jun 2003 12:14:38 +0000 (12:14 +0000)
committerMark Spencer <markster@digium.com>
Wed, 11 Jun 2003 12:14:38 +0000 (12:14 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1081 65c4cc65-6c06-0410-ace0-fbb531ad65f3

app.c
include/asterisk/pbx.h
pbx.c

diff --git a/app.c b/app.c
index 9436813..4c4cfab 100755 (executable)
--- a/app.c
+++ b/app.c
@@ -21,6 +21,7 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <asterisk/channel.h>
+#include <asterisk/pbx.h>
 #include <asterisk/file.h>
 #include <asterisk/app.h>
 #include <asterisk/dsp.h>
@@ -40,8 +41,9 @@ int ast_app_getdata(struct ast_channel *c, char *prompt, char *s, int maxlen, in
                if (res < 0)
                        return res;
        }
-       fto = 6000;
-       to = 2000;
+       fto = c->pbx ? c->pbx->rtimeout * 1000 : 6000;
+       to = c->pbx ? c->pbx->dtimeout * 1000 : 2000;
+
        if (timeout > 0) fto = to = timeout;
        if (timeout < 0) fto = to = 1000000000;
        res = ast_readstring(c, s, maxlen, to, fto, "#");
index fa2c513..f86793e 100755 (executable)
@@ -68,6 +68,13 @@ struct ast_switch {
        int (*matchmore)(struct ast_channel *chan, char *context, char *exten, int priority, char *callerid, char *data);
 };
 
+struct ast_pbx {
+        int dtimeout;                                   /* Timeout between digits (seconds) */
+        int rtimeout;                                   /* Timeout for response
+                                                          (seconds) */
+};
+
+
 //! Register an alternative switch
 /*!
  * \param sw switch to register
diff --git a/pbx.c b/pbx.c
index a0c58fa..9d7ea64 100755 (executable)
--- a/pbx.c
+++ b/pbx.c
 
 struct ast_context;
 
-struct ast_pbx {
-       int dtimeout;                                   /* Timeout between digits (seconds) */
-       int rtimeout;                                   /* Timeout for response (seconds) */
-};
-
 /* An extension */
 struct ast_exten {
        char exten[AST_MAX_EXTENSION];