diff options
author | Richard Mudgett <rmudgett@digium.com> | 2016-07-12 17:24:54 -0500 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2016-07-19 10:33:46 -0500 |
commit | 804fbd9c2bb3b62a8bcdf98eee51d7a586f62140 (patch) | |
tree | 23caff976b5c103b83e7a6b9014d84b3b362c3af /include | |
parent | 0d1744e1322256c2522bab34db18b75403b7d7ee (diff) |
res_fax: Fix FAXOPT(faxdetect) timeout option.
The fax detection timeout option did not work because basically the wrong
variable was checked in fax_detect_framehook(). As a result, the timer
would timeout immediately and disable fax detection.
* Fixed ignoring negative timeout values. We'd complain and then go right
on using the negative value.
* Fixed destroy_faxdetect() in the off-nominal case of an incomplete
object creation.
* Added more range checking to FAXOPT(gateway) timeout parameter.
ASTERISK-26214 #close
Reported by: Richard Mudgett
Change-Id: Idc5e698dfe33572de9840bc68cd9fc043cbad976
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/res_fax.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/res_fax.h b/include/asterisk/res_fax.h index 2304da734..5119bfa6c 100644 --- a/include/asterisk/res_fax.h +++ b/include/asterisk/res_fax.h @@ -179,11 +179,11 @@ struct ast_fax_session_details { unsigned int t38timeout; /*! the id of the t.38 gateway framehook for this channel */ int gateway_id; - /*! the timeout for this gateway in seconds */ + /*! The timeout for this gateway in ms */ int gateway_timeout; /*! the id of the faxdetect framehook for this channel */ int faxdetect_id; - /*! The timeout for this fax detect in seconds */ + /*! The timeout for this fax detect in ms */ int faxdetect_timeout; /*! flags used for fax detection */ int faxdetect_flags; |