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

support mac 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10903 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-12-21 23:31:57 +00:00
parent be1bb06be4
commit e7e94b1d75
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,14 +36,6 @@
#define closesocket(x) close(x)
#endif
#ifndef HAVE_GETHOSTBYNAME_R
extern int gethostbyname_r (const char *__name,
struct hostent *__result_buf,
char *__buf, size_t __buflen,
struct hostent **__result,
int *__h_errnump);
#endif
/* Written by Marc Espie, public domain */
@ -456,7 +448,7 @@ esl_status_t esl_connect(esl_handle_t *handle, const char *host, esl_port_t port
struct hostent *result;
char sendbuf[256];
int rval;
int rval = 0;
const char *hval;
if (!handle->mutex) {
@ -476,19 +468,18 @@ esl_status_t esl_connect(esl_handle_t *handle, const char *host, esl_port_t port
memset(&handle->hostent, 0, sizeof(handle->hostent));
#ifdef HAVE_GETHOSTBYNAME_R_FIVE
rval = gethostbyname_r(host, &handle->hostent, handle->hostbuf, sizeof(handle->hostbuf), &handle->errnum);
result = handle->hostent;
#else
rval = gethostbyname_r(host, &handle->hostent, handle->hostbuf, sizeof(handle->hostbuf), &result, &handle->errnum);
#endif
if ((result = gethostbyname(host))) {
handle->hostent = *result;
} else {
rval = -1;
}
if (rval) {
strerror_r(handle->errnum, handle->err, sizeof(handle->err));
goto fail;
}
memcpy(&handle->sockaddr.sin_addr, result->h_addr, result->h_length);
memcpy(&handle->sockaddr.sin_addr, result->h_addr_list[0], result->h_length);
rval = connect(handle->sock, (struct sockaddr *) &handle->sockaddr, sizeof(handle->sockaddr));

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

@ -35,6 +35,10 @@
#define _ESL_H_
#include <stdarg.h>
int vasprintf(char **ret, const char *format, va_list ap);
#define esl_copy_string(_x, _y, _z) strncpy(_x, _y, _z - 1)
#define esl_set_string(_x, _y) esl_copy_string(_x, _y, sizeof(_x))