diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2014-02-18 18:39:10 +0000 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2014-02-18 18:39:10 +0000 |
commit | b7dabd9efbd86724944f9a1e79bc04dc4e6cc9f3 (patch) | |
tree | 229d248e8b9f18f1aa1233cb2a50021a2acc8ba2 | |
parent | d45a402420ff067428422e33efeedf341026c382 (diff) | |
download | libmicrohttpd-b7dabd9efbd86724944f9a1e79bc04dc4e6cc9f3.tar.gz libmicrohttpd-b7dabd9efbd86724944f9a1e79bc04dc4e6cc9f3.zip |
remove inet_pton() from tests, use real IPv6 loopback for test
-rw-r--r-- | src/include/platform.h | 4 | ||||
-rw-r--r-- | src/testcurl/https/test_https_time_out.c | 2 | ||||
-rw-r--r-- | src/testcurl/https/test_tls_extensions.c | 2 | ||||
-rw-r--r-- | 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 index 55b32159..1ee0ee1c 100644 --- a/src/include/platform.h +++ b/src/include/platform.h | |||
@@ -118,6 +118,10 @@ | |||
118 | 118 | ||
119 | #include <plibc.h> | 119 | #include <plibc.h> |
120 | 120 | ||
121 | #if defined(_WIN32) && !defined(__CYGWIN__) | ||
122 | #include <ws2tcpip.h> | ||
123 | #endif | ||
124 | |||
121 | #ifndef MHD_SOCKET_DEFINED | 125 | #ifndef MHD_SOCKET_DEFINED |
122 | /** | 126 | /** |
123 | * MHD_socket is type for socket FDs | 127 | * 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 index 452035bb..f8f3c99d 100644 --- 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) | |||
55 | memset (&sa, '\0', sizeof (struct sockaddr_in)); | 55 | memset (&sa, '\0', sizeof (struct sockaddr_in)); |
56 | sa.sin_family = AF_INET; | 56 | sa.sin_family = AF_INET; |
57 | sa.sin_port = htons (DEAMON_TEST_PORT); | 57 | sa.sin_port = htons (DEAMON_TEST_PORT); |
58 | inet_pton (AF_INET, "127.0.0.1", &sa.sin_addr); | 58 | sa.sin_addr.s_addr = htonl (INADDR_LOOPBACK); |
59 | 59 | ||
60 | gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) (long) sd); | 60 | gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) (long) sd); |
61 | 61 | ||
diff --git a/src/testcurl/https/test_tls_extensions.c b/src/testcurl/https/test_tls_extensions.c index c1629d86..9e3a9506 100644 --- 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, | |||
80 | memset (&sa, '\0', sizeof (struct sockaddr_in)); | 80 | memset (&sa, '\0', sizeof (struct sockaddr_in)); |
81 | sa.sin_family = AF_INET; | 81 | sa.sin_family = AF_INET; |
82 | sa.sin_port = htons (DEAMON_TEST_PORT); | 82 | sa.sin_port = htons (DEAMON_TEST_PORT); |
83 | inet_pton (AF_INET, "127.0.0.1", &sa.sin_addr); | 83 | sa.sin_addr.s_addr = htonl (INADDR_LOOPBACK); |
84 | 84 | ||
85 | enum MHD_GNUTLS_Protocol hver; | 85 | enum MHD_GNUTLS_Protocol hver; |
86 | 86 | ||
diff --git a/src/testcurl/test_options.c b/src/testcurl/test_options.c index 79042a46..717e188b 100644 --- a/src/testcurl/test_options.c +++ b/src/testcurl/test_options.c | |||
@@ -80,16 +80,13 @@ test_ip_addr_option () | |||
80 | memset (&daemon_ip_addr, 0, sizeof (struct sockaddr_in)); | 80 | memset (&daemon_ip_addr, 0, sizeof (struct sockaddr_in)); |
81 | daemon_ip_addr.sin_family = AF_INET; | 81 | daemon_ip_addr.sin_family = AF_INET; |
82 | daemon_ip_addr.sin_port = htons (4233); | 82 | daemon_ip_addr.sin_port = htons (4233); |
83 | daemon_ip_addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK); | ||
83 | 84 | ||
84 | #if HAVE_INET6 | 85 | #if HAVE_INET6 |
85 | memset (&daemon_ip_addr6, 0, sizeof (struct sockaddr_in6)); | 86 | memset (&daemon_ip_addr6, 0, sizeof (struct sockaddr_in6)); |
86 | daemon_ip_addr6.sin6_family = AF_INET6; | 87 | daemon_ip_addr6.sin6_family = AF_INET6; |
87 | daemon_ip_addr6.sin6_port = htons (4233); | 88 | daemon_ip_addr6.sin6_port = htons (4233); |
88 | #endif | 89 | daemon_ip_addr6.sin6_addr = in6addr_loopback; |
89 | |||
90 | inet_pton (AF_INET, "127.0.0.1", &daemon_ip_addr.sin_addr); | ||
91 | #if HAVE_INET6 | ||
92 | inet_pton (AF_INET6, "::ffff:127.0.0.1", &daemon_ip_addr6.sin6_addr); | ||
93 | #endif | 90 | #endif |
94 | 91 | ||
95 | d = MHD_start_daemon (MHD_USE_DEBUG, 4233, | 92 | d = MHD_start_daemon (MHD_USE_DEBUG, 4233, |