kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-13 10:37:42 +00:00
Code Issues Projects Releases Wiki Activity

use uint32_t instead of long for timeout as in the rest of the lib, 0 means forever. Also added esl_send_recv_timed()

Browse Source
This commit is contained in:
Mathieu Rene 2010-07-20 16:23:01 -04:00
parent 13137e228c
commit 49d6c803d1
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -607,7 +607,7 @@ ESL_DECLARE(esl_status_t) esl_listen(const char *host, esl_port_t port, esl_list
} }
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) 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, uint32_t timeout)
{ {
char sendbuf[256]; char sendbuf[256];
int rval = 0; int rval = 0;
@ -649,7 +649,7 @@ ESL_DECLARE(esl_status_t) esl_connect_timeout(esl_handle_t *handle, const char *
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) { if (timeout) {
#ifdef WIN32 #ifdef WIN32
u_long arg = 1; u_long arg = 1;
if (ioctlsocket(handle->sock, FIONBIO, &arg) == SOCKET_ERROR) { if (ioctlsocket(handle->sock, FIONBIO, &arg) == SOCKET_ERROR) {
@ -667,7 +667,7 @@ ESL_DECLARE(esl_status_t) esl_connect_timeout(esl_handle_t *handle, const char *
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) { if (timeout) {
fd_set wfds; fd_set wfds;
struct timeval tv = { timeout / 1000, (timeout % 1000) * 1000 }; struct timeval tv = { timeout / 1000, (timeout % 1000) * 1000 };
int r; int r;
@ -801,6 +801,10 @@ ESL_DECLARE(esl_status_t) esl_recv_event_timed(esl_handle_t *handle, uint32_t ms
int max, activity; int max, activity;
esl_status_t status = ESL_SUCCESS; esl_status_t status = ESL_SUCCESS;
if (!ms) {
return esl_recv_event(handle, check_q, save_event);
}
if (!handle || !handle->connected || handle->sock == ESL_SOCK_INVALID) { if (!handle || !handle->connected || handle->sock == ESL_SOCK_INVALID) {
return ESL_FAIL; return ESL_FAIL;
} }
@ -814,13 +818,8 @@ ESL_DECLARE(esl_status_t) esl_recv_event_timed(esl_handle_t *handle, uint32_t ms
esl_mutex_unlock(handle->mutex); esl_mutex_unlock(handle->mutex);
} }
if (ms == -1) {
ms = 30000;
}
tv.tv_usec = ms * 1000; tv.tv_usec = ms * 1000;
FD_ZERO(&rfds); FD_ZERO(&rfds);
FD_ZERO(&efds); FD_ZERO(&efds);
@ -1146,7 +1145,7 @@ ESL_DECLARE(esl_status_t) esl_send(esl_handle_t *handle, const char *cmd)
} }
ESL_DECLARE(esl_status_t) esl_send_recv(esl_handle_t *handle, const char *cmd) ESL_DECLARE(esl_status_t) esl_send_recv_timed(esl_handle_t *handle, const char *cmd, uint32_t ms)
{ {
const char *hval; const char *hval;
esl_status_t status; esl_status_t status;
@ -1176,7 +1175,7 @@ ESL_DECLARE(esl_status_t) esl_send_recv(esl_handle_t *handle, const char *cmd)
recv: recv:
status = esl_recv_event(handle, 0, &handle->last_sr_event); status = esl_recv_event_timed(handle, ms, 0, &handle->last_sr_event);
if (handle->last_sr_event) { if (handle->last_sr_event) {
char *ct = esl_event_get_header(handle->last_sr_event,"content-type"); char *ct = esl_event_get_header(handle->last_sr_event,"content-type");

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

@ -389,8 +389,8 @@ ESL_DECLARE(esl_status_t) esl_sendevent(esl_handle_t *handle, esl_event_t *event
\param password FreeSWITCH server password \param password FreeSWITCH server password
\param timeout Connection timeout, in miliseconds \param timeout Connection timeout, in miliseconds
*/ */
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); 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, uint32_t timeout);
#define esl_connect(_handle, _host, _port, _user, _password) esl_connect_timeout(_handle, _host, _port, _user, _password, -1) #define esl_connect(_handle, _host, _port, _user, _password) esl_connect_timeout(_handle, _host, _port, _user, _password, 0)
/*! /*!
\brief Disconnect a handle \brief Disconnect a handle
@ -423,7 +423,8 @@ ESL_DECLARE(esl_status_t) esl_recv_event_timed(esl_handle_t *handle, uint32_t ms
\param handle Handle to be used \param handle Handle to be used
\param cmd Raw command to send \param cmd Raw command to send
*/ */
ESL_DECLARE(esl_status_t) esl_send_recv(esl_handle_t *handle, const char *cmd); ESL_DECLARE(esl_status_t) esl_send_recv_timed(esl_handle_t *handle, const char *cmd, uint32_t ms);
#define esl_send_recv(_handle, _cmd) esl_send_recv_timed(_handle, _cmd, 0)
/*! /*!
\brief Applies a filter to received events \brief Applies a filter to received events
\param handle Handle to apply the filter to \param handle Handle to apply the filter to