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

FS-4828 --resolve

Browse Source
This commit is contained in:
Jeff Lenk 2012-11-17 21:38:07 -06:00
parent de7dc5685d
commit c7e8dce247
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -918,6 +918,7 @@ ESL_DECLARE(esl_status_t) esl_connect_timeout(esl_handle_t *handle, const char *
struct addrinfo hints = { 0 }, *result; struct addrinfo hints = { 0 }, *result;
struct sockaddr_in *sockaddr_in; struct sockaddr_in *sockaddr_in;
struct sockaddr_in6 *sockaddr_in6; struct sockaddr_in6 *sockaddr_in6;
socklen_t socklen;
#ifndef WIN32 #ifndef WIN32
int fd_flags = 0; int fd_flags = 0;
#else #else
@ -951,10 +952,12 @@ ESL_DECLARE(esl_status_t) esl_connect_timeout(esl_handle_t *handle, const char *
case AF_INET: case AF_INET:
sockaddr_in = (struct sockaddr_in*)&(handle->sockaddr); sockaddr_in = (struct sockaddr_in*)&(handle->sockaddr);
sockaddr_in->sin_port = htons(port); sockaddr_in->sin_port = htons(port);
socklen = sizeof(struct sockaddr_in);
break; break;
case AF_INET6: case AF_INET6:
sockaddr_in6 = (struct sockaddr_in6*)&(handle->sockaddr); sockaddr_in6 = (struct sockaddr_in6*)&(handle->sockaddr);
sockaddr_in6->sin6_port = htons(port); sockaddr_in6->sin6_port = htons(port);
socklen = sizeof(struct sockaddr_in6);
break; break;
default: default:
strncpy(handle->err, "Host resolves to unsupported address family", sizeof(handle->err)); strncpy(handle->err, "Host resolves to unsupported address family", sizeof(handle->err));
@ -985,7 +988,7 @@ ESL_DECLARE(esl_status_t) esl_connect_timeout(esl_handle_t *handle, const char *
#endif #endif
} }
rval = connect(handle->sock, (struct sockaddr*)&handle->sockaddr, sizeof(handle->sockaddr)); rval = connect(handle->sock, (struct sockaddr*)&handle->sockaddr, socklen);
if (timeout) { if (timeout) {
int r; int r;