diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-07-21 18:26:39 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-07-21 18:26:39 -0500 |
| commit | 0b8448a74be219b98e55b9128c939f8f51859c3b (patch) | |
| tree | 19d1a2b65e7e3c609e88cf432f73e84c82f6e354 /channels/chan_dahdi.h | |
| parent | efebb1b9e0c36690b890a891d2735ee84867a522 (diff) | |
| parent | 676aeede3643dbe9b79fd7117ce7e335f236d151 (diff) | |
Merge changes from topic 'ASTERISK-26214' into 13
* changes:
res_fax: Fix FAXOPT(faxdetect) timeout option.
chan_dahdi: Add faxdetect_timeout option.
Diffstat (limited to 'channels/chan_dahdi.h')
| -rw-r--r-- | channels/chan_dahdi.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/channels/chan_dahdi.h b/channels/chan_dahdi.h index 4bb5d19a2..ab5c1eba9 100644 --- a/channels/chan_dahdi.h +++ b/channels/chan_dahdi.h @@ -612,6 +612,11 @@ struct dahdi_pvt { */ int dialtone_detect; int dialtone_scanning_time_elapsed; /*!< Amount of audio scanned for dialtone, in frames */ + /*! + * \brief The number of seconds into call to disable fax detection. (0 = disabled) + * \note Set from the "faxdetect_timeout" value read in from chan_dahdi.conf + */ + unsigned int faxdetect_timeout; struct timeval waitingfordt; /*!< Time we started waiting for dialtone */ struct timeval flashtime; /*!< Last flash-hook time */ /*! \brief Opaque DSP configuration structure. */ |