libmicrohttpd

commit b7dabd9efbd86724944f9a1e79bc04dc4e6cc9f3
parent d45a402420ff067428422e33efeedf341026c382
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date:   Tue, 18 Feb 2014 18:39:10 +0000

remove inet_pton() from tests, use real IPv6 loopback for test

Diffstat:
M
src/include/platform.h
 | 
4
++++
M
src/testcurl/https/test_https_time_out.c
 | 
2
+-
M
src/testcurl/https/test_tls_extensions.c
 | 
2
+-
M
src/testcurl/test_options.c
 | 
7
++-----

4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/include/platform.h b/src/include/platform.h
@@ -118,6 +118,10 @@
 
 #include <plibc.h>
 
+#if defined(_WIN32) && !defined(__CYGWIN__)
+#include <ws2tcpip.h>
+#endif
+
 #ifndef MHD_SOCKET_DEFINED
 /**
  * MHD_socket is type for socket FDs
diff --git a/src/testcurl/https/test_https_time_out.c b/src/testcurl/https/test_https_time_out.c
@@ -55,7 +55,7 @@ test_tls_session_time_out (gnutls_session_t session)
   memset (&sa, '\0', sizeof (struct sockaddr_in));
   sa.sin_family = AF_INET;
   sa.sin_port = htons (DEAMON_TEST_PORT);
-  inet_pton (AF_INET, "127.0.0.1", &sa.sin_addr);
+  sa.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
 
   gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) (long) sd);
 
diff --git a/src/testcurl/https/test_tls_extensions.c b/src/testcurl/https/test_tls_extensions.c
@@ -80,7 +80,7 @@ test_hello_extension (gnutls_session_t session, extensions_t exten_t,
   memset (&sa, '\0', sizeof (struct sockaddr_in));
   sa.sin_family = AF_INET;
   sa.sin_port = htons (DEAMON_TEST_PORT);
-  inet_pton (AF_INET, "127.0.0.1", &sa.sin_addr);
+  sa.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
 
   enum MHD_GNUTLS_Protocol hver;
 
diff --git a/src/testcurl/test_options.c b/src/testcurl/test_options.c
@@ -80,16 +80,13 @@ test_ip_addr_option ()
   memset (&daemon_ip_addr, 0, sizeof (struct sockaddr_in));
   daemon_ip_addr.sin_family = AF_INET;
   daemon_ip_addr.sin_port = htons (4233);
+  daemon_ip_addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
 
 #if HAVE_INET6
   memset (&daemon_ip_addr6, 0, sizeof (struct sockaddr_in6));
   daemon_ip_addr6.sin6_family = AF_INET6;
   daemon_ip_addr6.sin6_port = htons (4233);
-#endif
-
-  inet_pton (AF_INET, "127.0.0.1", &daemon_ip_addr.sin_addr);
-#if HAVE_INET6
-  inet_pton (AF_INET6, "::ffff:127.0.0.1", &daemon_ip_addr6.sin6_addr);
+  daemon_ip_addr6.sin6_addr = in6addr_loopback;
 #endif
 
   d = MHD_start_daemon (MHD_USE_DEBUG, 4233,