Preston_PLB/freeswitch
1
0
Fork 0
forked from Mirrors/freeswitch
Code Pull Requests Activity

ESL-58 --resolve

Browse Source 
Please Windows user test this one out.
This commit is contained in:
Marc Olivier Chouinard 2011-12-15 23:02:10 -05:00
parent 7ae3f5b7d5
commit 58ccbe567c
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libs/esl/src/esl.c
View File

@ -53,10 +53,13 @@
#ifndef WIN32 #ifndef WIN32
#define closesocket(x) close(x) #define closesocket(x) close(x)
#include <fcntl.h> #include <fcntl.h>
#include <errno.h>
#else #else
#pragma warning (disable:6386) #pragma warning (disable:6386)
/* These warnings need to be ignored warning in sdk header */ /* These warnings need to be ignored warning in sdk header */
#include <Ws2tcpip.h> #include <Ws2tcpip.h>
#include <windows.h>
#define errno WSAGetLastError()
#pragma warning (default:6386) #pragma warning (default:6386)
#endif #endif
@ -1083,9 +1086,23 @@ ESL_DECLARE(esl_status_t) esl_recv_event_timed(esl_handle_t *handle, uint32_t ms
static esl_ssize_t handle_recv(esl_handle_t *handle, void *data, esl_size_t datalen) static esl_ssize_t handle_recv(esl_handle_t *handle, void *data, esl_size_t datalen)
{ {
int activity;
while (handle->connected) {
activity = esl_wait_sock(handle->sock, 1000, ESL_POLL_READ|ESL_POLL_ERROR);
if (activity > 0 && (activity & ESL_POLL_READ)) {
return recv(handle->sock, data, datalen, 0); return recv(handle->sock, data, datalen, 0);
} }
if (activity < 0) {
return errno == EINTR ? 0 : -1;
}
}
return -1;
}
ESL_DECLARE(esl_status_t) esl_recv_event(esl_handle_t *handle, int check_q, esl_event_t **save_event) ESL_DECLARE(esl_status_t) esl_recv_event(esl_handle_t *handle, int check_q, esl_event_t **save_event)
{ {
char *c; char *c;