sysmocom/asterisk
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "res_fax: Fix FAXOPT(faxdetect) timeout option."

Browse source
This commit is contained in:
Joshua Colp 2016-07-21 18:25:55 -05:00 committed by Gerrit Code Review
commit 7f36b79f87
2 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/asterisk/res_fax.h
View file

@ -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;

38
res/res_fax.c
View file

@ -468,8 +468,6 @@ struct fax_gateway {
struct fax_detect {
/*! \brief the start of our timeout counter */
struct timeval timeout_start;
/*! \brief faxdetect timeout */
int timeout;
/*! \brief DSP Processor */
struct ast_dsp *dsp;
/*! \brief original audio formats */
@ -3539,13 +3537,13 @@ static void destroy_faxdetect(void *data)
ast_dsp_free(faxdetect->dsp);
faxdetect->dsp = NULL;
}
ao2_ref(faxdetect->details, -1);
ao2_cleanup(faxdetect->details);
ao2_cleanup(faxdetect->orig_format);
}
/*! \brief Create a new fax detect object.
* \param chan the channel attaching to
* \param timeout remove framehook in this time if set
* \param timeout in ms to remove framehook in this time if not zero
* \param flags required options
* \return NULL or a fax gateway object
*/
@ -3652,8 +3650,9 @@ static struct ast_frame *fax_detect_framehook(struct ast_channel *chan, struct a
return f;
}
if ((!ast_tvzero(faxdetect->timeout_start) &&
(ast_tvdiff_ms(ast_tvnow(), faxdetect->timeout_start) > faxdetect->timeout))) {
if (!ast_tvzero(faxdetect->timeout_start)
&& ast_tvdiff_ms(ast_tvnow(), faxdetect->timeout_start) > details->faxdetect_timeout) {
ast_debug(1, "FAXOPT(faxdetect) timeout on %s\n", ast_channel_name(chan));
ast_framehook_detach(chan, details->faxdetect_id);
details->faxdetect_id = -1;
return f;
@ -3732,7 +3731,7 @@ static struct ast_frame *fax_detect_framehook(struct ast_channel *chan, struct a
/*! \brief Attach a faxdetect framehook object to a channel.
* \param chan the channel to attach to
* \param timeout remove framehook in this time if set
* \param timeout in ms to remove framehook in this time if not zero
* \return the faxdetect structure or NULL on error
* \param flags required options
* \retval -1 error
@ -4480,8 +4479,14 @@ static int acf_faxopt_write(struct ast_channel *chan, const char *cmd, char *dat
details->gateway_timeout = 0;
if (timeout) {
unsigned int gwtimeout;
if (sscanf(timeout, "%u", &gwtimeout) == 1) {
details->gateway_timeout = gwtimeout * 1000;
if (sscanf(timeout, "%30u", &gwtimeout) == 1) {
if (gwtimeout >= 0) {
details->gateway_timeout = gwtimeout * 1000;
} else {
ast_log(LOG_WARNING, "%s(%s) timeout cannot be negative. Ignoring timeout\n",
cmd, data);
}
} else {
ast_log(LOG_WARNING, "Unsupported timeout '%s' passed to FAXOPT(%s).\n", timeout, data);
}
@ -4516,11 +4521,18 @@ static int acf_faxopt_write(struct ast_channel *chan, const char *cmd, char *dat
if (ast_true(val) || !strcasecmp(val, "t38") || !strcasecmp(val, "cng")) {
if (details->faxdetect_id < 0) {
if (timeout && (sscanf(timeout, "%u", &fdtimeout) == 1)) {
if (fdtimeout > 0) {
fdtimeout = fdtimeout * 1000;
if (timeout) {
if (sscanf(timeout, "%30u", &fdtimeout) == 1) {
if (fdtimeout >= 0) {
fdtimeout *= 1000;
} else {
ast_log(LOG_WARNING, "%s(%s) timeout cannot be negative. Ignoring timeout\n",
cmd, data);
fdtimeout = 0;
}
} else {
ast_log(LOG_WARNING, "Timeout cannot be negative ignoring timeout\n");
ast_log(LOG_WARNING, "Unsupported timeout '%s' passed to FAXOPT(%s).\n",
timeout, data);
}
}