[GNUnet-SVN] r32398 - in libmicrohttpd/src: include testcurl testcurl/https

[gnunet]

Author: Karlson2k
Date: 2014-02-18 19:39:10 +0100 (Tue, 18 Feb 2014)
New Revision: 32398

Modified:
   libmicrohttpd/src/include/platform.h
   libmicrohttpd/src/testcurl/https/test_https_time_out.c
   libmicrohttpd/src/testcurl/https/test_tls_extensions.c
   libmicrohttpd/src/testcurl/test_options.c
Log:
remove inet_pton() from tests, use real IPv6 loopback for test

Modified: libmicrohttpd/src/include/platform.h
===================================================================
--- libmicrohttpd/src/include/platform.h        2014-02-18 18:38:58 UTC (rev 
32397)
+++ libmicrohttpd/src/include/platform.h        2014-02-18 18:39:10 UTC (rev 
32398)
@@ -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

Modified: libmicrohttpd/src/testcurl/https/test_https_time_out.c
===================================================================
--- libmicrohttpd/src/testcurl/https/test_https_time_out.c      2014-02-18 
18:38:58 UTC (rev 32397)
+++ libmicrohttpd/src/testcurl/https/test_https_time_out.c      2014-02-18 
18:39:10 UTC (rev 32398)
@@ -55,7 +55,7 @@
   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);
 

Modified: libmicrohttpd/src/testcurl/https/test_tls_extensions.c
===================================================================
--- libmicrohttpd/src/testcurl/https/test_tls_extensions.c      2014-02-18 
18:38:58 UTC (rev 32397)
+++ libmicrohttpd/src/testcurl/https/test_tls_extensions.c      2014-02-18 
18:39:10 UTC (rev 32398)
@@ -80,7 +80,7 @@
   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;
 

Modified: libmicrohttpd/src/testcurl/test_options.c
===================================================================
--- libmicrohttpd/src/testcurl/test_options.c   2014-02-18 18:38:58 UTC (rev 
32397)
+++ libmicrohttpd/src/testcurl/test_options.c   2014-02-18 18:39:10 UTC (rev 
32398)
@@ -80,18 +80,15 @@
   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);
+  daemon_ip_addr6.sin6_addr = in6addr_loopback;
 #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);
-#endif
-
   d = MHD_start_daemon (MHD_USE_DEBUG, 4233,
                         NULL, NULL, &ahc_echo, NULL, MHD_OPTION_SOCK_ADDR,
                         &daemon_ip_addr, MHD_OPTION_END);