From 12f00a7accb1782492c2bdae18b53dd1e15894ae Mon Sep 17 00:00:00 2001
From: toddouska <todd@wolfssl.com>
Date: Thu, 11 Apr 2013 12:30:09 -0700
Subject: [PATCH] change ipv6 tests to use getaddrinfo for better scope id %
 handling, inet_pton doesn't always work depending on system

---
 configure.ac                     |  2 +-
 cyassl/test.h                    | 37 ++++++++++++++++++++++++--------
 examples/client/client.c         |  4 ++--
 examples/echoclient/echoclient.c |  2 +-
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index 69fcbb446..40548857d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 AX_CXX_COMPILER_VERSION
 
 AC_CHECK_FUNCS([gethostbyname])
-AC_CHECK_FUNCS([inet_pton])
+AC_CHECK_FUNCS([getaddrinfo])
 AC_CHECK_FUNCS([gettimeofday])
 AC_CHECK_FUNCS([inet_ntoa])
 AC_CHECK_FUNCS([memset])
diff --git a/cyassl/test.h b/cyassl/test.h
index d7137035c..94a556b65 100644
--- a/cyassl/test.h
+++ b/cyassl/test.h
@@ -332,11 +332,12 @@ static INLINE void showPeer(CYASSL* ssl)
 }
 
 
-static INLINE void build_addr(SOCKADDR_IN_T* addr,
-                                const char* peer, word16 port)
+static INLINE void build_addr(SOCKADDR_IN_T* addr, const char* peer,
+                              word16 port, int udp)
 {
     int useLookup = 0;
     (void)useLookup;
+    (void)udp;
 
     memset(addr, 0, sizeof(SOCKADDR_IN_T));
 
@@ -371,11 +372,29 @@ static INLINE void build_addr(SOCKADDR_IN_T* addr,
     if (peer == INADDR_ANY)
         addr->sin6_addr = in6addr_any;
     else {
-        #ifdef HAVE_INET_PTON
-            if (inet_pton(AF_INET_V, peer, &addr->sin6_addr) != 1)
-                err_sys("ipv6 lookup failed");
+        #ifdef HAVE_GETADDRINFO
+            struct addrinfo  hints;
+            struct addrinfo* answer = NULL;
+            int    ret;
+            char   strPort[80];
+
+            memset(&hints, 0, sizeof(hints));
+
+            hints.ai_family   = AF_INET_V;
+            hints.ai_socktype = udp ? SOCK_DGRAM : SOCK_STREAM;
+            hints.ai_protocol = udp ? IPPROTO_UDP : IPPROTO_TCP;
+
+            snprintf(strPort, sizeof(strPort), "%d", port);
+            strPort[79] = '\0';
+
+            ret = getaddrinfo(peer, strPort, &hints, &answer);
+            if (ret < 0 || answer == NULL)
+                err_sys("getaddrinfo failed");
+
+            memcpy(addr, answer->ai_addr, answer->ai_addrlen);
+            freeaddrinfo(answer);
         #else
-            printf("no ipv6 inet_pton, loopback only tests/examples\n");
+            printf("no ipv6 getaddrinfo, loopback only tests/examples\n");
             addr->sin6_addr = in6addr_loopback;
         #endif
     }
@@ -424,7 +443,7 @@ static INLINE void tcp_connect(SOCKET_T* sockfd, const char* ip, word16 port,
                                int udp)
 {
     SOCKADDR_IN_T addr;
-    build_addr(&addr, ip, port);
+    build_addr(&addr, ip, port, udp);
     tcp_socket(sockfd, udp);
 
     if (!udp) {
@@ -482,7 +501,7 @@ static INLINE void tcp_listen(SOCKET_T* sockfd, int* port, int useAnyAddr,
 
     /* don't use INADDR_ANY by default, firewall may block, make user switch
        on */
-    build_addr(&addr, (useAnyAddr ? INADDR_ANY : yasslIP), *port);
+    build_addr(&addr, (useAnyAddr ? INADDR_ANY : yasslIP), *port, udp);
     tcp_socket(sockfd, udp);
 
 #ifndef USE_WINDOWS_API 
@@ -542,7 +561,7 @@ static INLINE void udp_accept(SOCKET_T* sockfd, int* clientfd, int useAnyAddr,
     SOCKADDR_IN_T addr;
 
     (void)args;
-    build_addr(&addr, (useAnyAddr ? INADDR_ANY : yasslIP), port);
+    build_addr(&addr, (useAnyAddr ? INADDR_ANY : yasslIP), port, 1);
     tcp_socket(sockfd, 1);
 
 
diff --git a/examples/client/client.c b/examples/client/client.c
index b223e20ed..4b0a0470d 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -439,7 +439,7 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
         err_sys("unable to get SSL object");
     if (doDTLS) {
         SOCKADDR_IN_T addr;
-        build_addr(&addr, host, port);
+        build_addr(&addr, host, port, 1);
         CyaSSL_dtls_set_peer(ssl, &addr, sizeof(addr));
         tcp_socket(&sockfd, 1);
     }
@@ -538,7 +538,7 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
             #else
                 sleep(1);
             #endif
-            build_addr(&addr, host, port);
+            build_addr(&addr, host, port, 1);
             CyaSSL_dtls_set_peer(sslResume, &addr, sizeof(addr));
             tcp_socket(&sockfd, 1);
         }
diff --git a/examples/echoclient/echoclient.c b/examples/echoclient/echoclient.c
index ec5fad42f..95ccb529c 100644
--- a/examples/echoclient/echoclient.c
+++ b/examples/echoclient/echoclient.c
@@ -135,7 +135,7 @@ void echoclient_test(void* args)
 
     if (doDTLS) {
         SOCKADDR_IN_T addr;
-        build_addr(&addr, yasslIP, port);
+        build_addr(&addr, yasslIP, port, 1);
         CyaSSL_dtls_set_peer(ssl, &addr, sizeof(addr));
         tcp_socket(&sockfd, 1);
     }