kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

freetdm: clear out wait flags in the core on timeout

This commit is contained in:
Moises Silva 2010-11-30 11:38:38 -05:00
parent a523e7755c
commit 469728a865
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libs/freetdm/src/ftdm_io.c
View File

@ -2828,21 +2828,17 @@ done:
FT_DECLARE(ftdm_status_t) ftdm_channel_wait(ftdm_channel_t *ftdmchan, ftdm_wait_flag_t *flags, int32_t to) FT_DECLARE(ftdm_status_t) ftdm_channel_wait(ftdm_channel_t *ftdmchan, ftdm_wait_flag_t *flags, int32_t to)
{ {
assert(ftdmchan != NULL); ftdm_status_t status = FTDM_FAIL;
assert(ftdmchan->fio != NULL); ftdm_assert_return(ftdmchan != NULL, FTDM_FAIL, "Null channel\n");
ftdm_assert_return(ftdmchan->fio != NULL, FTDM_FAIL, "Null io interface\n");
ftdm_assert_return(ftdmchan->fio->wait != NULL, FTDM_NOTIMPL, "wait method not implemented\n");
if (!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OPEN)) { status = ftdmchan->fio->wait(ftdmchan, flags, to);
snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "channel not open"); if (status == FTDM_TIMEOUT) {
return FTDM_FAIL; /* make sure the flags are cleared on timeout */
} *flags = 0;
if (!ftdmchan->fio->wait) {
snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "method not implemented");
return FTDM_FAIL;
} }
return status;
return ftdmchan->fio->wait(ftdmchan, flags, to);
} }
/*******************************/ /*******************************/