FS-4003 --resolve add IPv6 support to ESL client library, thanks to Steven Ayre

diff --git a/libs/esl/src/esl.c b/libs/esl/src/esl.c
index b092991988da63a2852175d7784ac783c17c3a6d..3972e7a7b43df6260a153794215255f2715a0c1d 100644 (file)
--- a/libs/esl/src/esl.c
+++ b/libs/esl/src/esl.c
@@ -916,6 +916,8 @@ ESL_DECLARE(esl_status_t) esl_connect_timeout(esl_handle_t *handle, const char *
        int rval = 0;
        const char *hval;
        struct addrinfo hints = { 0 }, *result;
+       struct sockaddr_in *sockaddr_in;
+       struct sockaddr_in6 *sockaddr_in6;
 #ifndef WIN32
        int fd_flags = 0;
 #else
@@ -936,27 +938,36 @@ ESL_DECLARE(esl_status_t) esl_connect_timeout(esl_handle_t *handle, const char *
        if (!handle->packet_buf) {
                esl_buffer_create(&handle->packet_buf, BUF_CHUNK, BUF_START, 0);
        }
-       
-       handle->sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
-       
-       if (handle->sock == ESL_SOCK_INVALID) {
-               snprintf(handle->err, sizeof(handle->err), "Socket Error");
-               return ESL_FAIL;
-       }
-
 
-       hints.ai_family = AF_INET;
        hints.ai_socktype = SOCK_STREAM;
-       
+
        if (getaddrinfo(host, NULL, &hints, &result)) {
                strncpy(handle->err, "Cannot resolve host", sizeof(handle->err));
                goto fail;
        }
 
        memcpy(&handle->sockaddr, result->ai_addr, sizeof(handle->sockaddr));   
-       handle->sockaddr.sin_family = AF_INET;
-       handle->sockaddr.sin_port = htons(port);
+        switch(handle->sockaddr.ss_family) {
+               case AF_INET:
+                       sockaddr_in = (struct sockaddr_in*)&(handle->sockaddr);
+                       sockaddr_in->sin_port = htons(port);
+                       break;
+               case AF_INET6:
+                       sockaddr_in6 = (struct sockaddr_in6*)&(handle->sockaddr);
+                       sockaddr_in6->sin6_port = htons(port);
+                       break;
+               default:
+                       strncpy(handle->err, "Host resolves to unsupported address family", sizeof(handle->err));
+                       goto fail;
+       }
        freeaddrinfo(result);
+       
+       handle->sock = socket(handle->sockaddr.ss_family, SOCK_STREAM, IPPROTO_TCP);
+       
+       if (handle->sock == ESL_SOCK_INVALID) {
+               snprintf(handle->err, sizeof(handle->err), "Socket Error");
+               return ESL_FAIL;
+       }
 
        if (timeout) {
 #ifdef WIN32

diff --git a/libs/esl/src/include/esl.h b/libs/esl/src/include/esl.h
index 5e66fe437a0bb51494e53c7cb39670ff7fd9b341..09e129ab78b53b0ec9835d83bb50c4cb8bc1891e 100644 (file)
--- a/libs/esl/src/include/esl.h
+++ b/libs/esl/src/include/esl.h
@@ -288,7 +288,7 @@ typedef enum {
 /*! \brief A handle that will hold the socket information and
            different events received. */
 typedef struct {
-       struct sockaddr_in sockaddr;
+       struct sockaddr_storage sockaddr;
        struct hostent hostent;
        char hostbuf[256];
        esl_socket_t sock;