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

This commit is contained in:
Evgeny Grin (Karlson2k)
2014-02-18 18:39:10 +00:00
parent d45a402420
commit b7dabd9efb
4 changed files with 8 additions and 7 deletions
+4
View File
@@ -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
+1 -1
View File
@@ -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);
+1 -1
View File
@@ -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;
+2 -5
View File
@@ -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,