kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-14 16:15:04 +00:00
Code Issues Projects Releases Wiki Activity

Add esl_connect_timeout to specify custom connection timeouts

Browse Source
This commit is contained in:
Mathieu Rene 2010-07-20 14:42:43 -04:00
parent 28eb6e0ad9
commit 12a0ec741b
2 changed files with 57 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@
#include <esl.h> #include <esl.h>
#ifndef WIN32 #ifndef WIN32
#define closesocket(x) close(x) #define closesocket(x) close(x)
#include <fcntl.h>
#else #else
#include <Ws2tcpip.h> #include <Ws2tcpip.h>
#endif #endif
@ -606,12 +607,13 @@ ESL_DECLARE(esl_status_t) esl_listen(const char *host, esl_port_t port, esl_list
} }
ESL_DECLARE(esl_status_t) esl_connect(esl_handle_t *handle, const char *host, esl_port_t port, const char *user, const char *password) ESL_DECLARE(esl_status_t) esl_connect_timeout(esl_handle_t *handle, const char *host, esl_port_t port, const char *user, const char *password, long timeout)
{ {
char sendbuf[256]; char sendbuf[256];
int rval = 0; int rval = 0;
const char *hval; const char *hval;
struct addrinfo hints = { 0 }, *result; struct addrinfo hints = { 0 }, *result;
int fd_flags;
#ifdef WIN32 #ifdef WIN32
WORD wVersionRequested = MAKEWORD(2, 0); WORD wVersionRequested = MAKEWORD(2, 0);
WSADATA wsaData; WSADATA wsaData;
@ -647,8 +649,58 @@ ESL_DECLARE(esl_status_t) esl_connect(esl_handle_t *handle, const char *host, es
handle->sockaddr.sin_family = AF_INET; handle->sockaddr.sin_family = AF_INET;
handle->sockaddr.sin_port = htons(port); handle->sockaddr.sin_port = htons(port);
if (timeout != -1) {
#ifdef WIN32
u_long arg = 1;
if (ioctlsocket(handle->sock, FIONBIO, &arg) == SOCKET_ERROR) {
snprintf(handle->err, sizeof(handle->err), "Socket Connection Error");
goto fail;
}
#else
fd_flags = fcntl(handle->sock, F_GETFL, 0);
if (fcntl(handle->sock, F_SETFL, fd_flags | O_NONBLOCK)) {
snprintf(handle->err, sizeof(handle->err), "Socket Connection Error");
goto fail;
}
#endif
}
rval = connect(handle->sock, (struct sockaddr*)&handle->sockaddr, sizeof(handle->sockaddr)); rval = connect(handle->sock, (struct sockaddr*)&handle->sockaddr, sizeof(handle->sockaddr));
if (timeout != -1) {
fd_set wfds;
struct timeval tv = { timeout / 1000, (timeout % 1000) * 1000 };
int r;
FD_ZERO(&wfds);
FD_SET(handle->sock, &wfds);
r = select(handle->sock + 1, NULL, &wfds, NULL, &tv);
if (r <= 0) {
snprintf(handle->err, sizeof(handle->err), "Connection timed out");
goto fail;
}
if (!FD_ISSET(handle->sock, &wfds)) {
snprintf(handle->err, sizeof(handle->err), "Connection timed out");
goto fail;
}
#ifdef WIN32
{
u_long arg = 0;
if (ioctlsocket(handle->sock, FIONBIO, &arg) == SOCKET_ERROR) {
snprintf(handle->err, sizeof(handle->err), "Socket Connection Error");
goto fail;
}
}
#else
fcntl(handle->sock, F_SETFL, fd_flags);
#endif
rval = 0;
}
freeaddrinfo(result); freeaddrinfo(result);
result = NULL; result = NULL;

5
libs/esl/src/include/esl.h
View File

@ -387,8 +387,11 @@ ESL_DECLARE(esl_status_t) esl_sendevent(esl_handle_t *handle, esl_event_t *event
\param port Port to be connected \param port Port to be connected
\param password FreeSWITCH server username (optional) \param password FreeSWITCH server username (optional)
\param password FreeSWITCH server password \param password FreeSWITCH server password
\param timeout Connection timeout, in miliseconds
*/ */
ESL_DECLARE(esl_status_t) esl_connect(esl_handle_t *handle, const char *host, esl_port_t port, const char *user, const char *password); ESL_DECLARE(esl_status_t) esl_connect_timeout(esl_handle_t *handle, const char *host, esl_port_t port, const char *user, const char *password, long timeout);
#define esl_connect(_handle, _host, _port, _user, _password) esl_connect_timeout(_handle, _host, _port, _user, _password, -1)
/*! /*!
\brief Disconnect a handle \brief Disconnect a handle
\param handle Handle to be disconnected \param handle Handle to be disconnected