kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-14 01:49:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.freeswitch.org/freeswitch

Browse Source
This commit is contained in:
Stefan Knoblich
2010-11-07 15:51:53 +01:00
parent 6e217401d9 46a9fa3910
commit dc2a28c27c
3 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
View File

@@ -867,7 +867,7 @@ static FIO_WAIT_FUNCTION(zt_wait)
{
int32_t inflags = 0;
int result;
struct pollfd pfds[1];
struct pollfd pfds[1];
if (*flags & FTDM_READ) {
inflags |= POLLIN;
@@ -882,13 +882,14 @@ static FIO_WAIT_FUNCTION(zt_wait)
}
memset(&pfds[0], 0, sizeof(pfds[0]));
pfds[0].fd = ftdmchan->sockfd;
pfds[0].events = inflags;
result = poll(pfds, 1, to);
memset(&pfds[0], 0, sizeof(pfds[0]));
pfds[0].fd = ftdmchan->sockfd;
pfds[0].events = inflags;
result = poll(pfds, 1, to);
*flags = 0;
if (pfds[0].revents & POLLERR) {
ftdm_log_chan_msg(ftdmchan, FTDM_LOG_ERROR, "DAHDI device got POLLERR\n");
result = -1;
}
@@ -900,6 +901,7 @@ static FIO_WAIT_FUNCTION(zt_wait)
if (result < 0){
snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "Poll failed");
ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Failed to poll DAHDI device: %s\n", strerror(errno));
return FTDM_FAIL;
}