3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-16 12:16:33 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3381 from bluca/test_ipv6_monitor

Browse Source 
Problems: ipv6 test_monitor hangs, old Windows build fails
This commit is contained in:
Simon Giesecke 2019-02-03 22:57:11 +01:00 committed by GitHub
commit c28cbf76d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -153,6 +153,7 @@ test_proxy_hwm
unittest_ip_resolver unittest_ip_resolver
unittest_mtrie unittest_mtrie
unittest_poller unittest_poller
unittest_radix_tree
unittest_udp_address unittest_udp_address
unittest_ypipe unittest_ypipe
tests/test*.log tests/test*.log

3
include/zmq.h
View File

@ -98,6 +98,9 @@ extern "C" {
#if defined ZMQ_HAVE_SOLARIS || defined ZMQ_HAVE_OPENVMS #if defined ZMQ_HAVE_SOLARIS || defined ZMQ_HAVE_OPENVMS
#include <inttypes.h> #include <inttypes.h>
#elif defined _MSC_VER && _MSC_VER < 1600 #elif defined _MSC_VER && _MSC_VER < 1600
#ifndef uint64_t
typedef unsigned __int64 uint64_t;
#endif
#ifndef int32_t #ifndef int32_t
typedef __int32 int32_t; typedef __int32 int32_t;
#endif #endif

6
tests/test_monitor.cpp
View File

@ -145,6 +145,12 @@ void test_monitor_versioned_basic (bind_function_t bind_function_,
// Now do a basic ping test // Now do a basic ping test
bind_function_ (server, server_endpoint, sizeof server_endpoint); bind_function_ (server, server_endpoint, sizeof server_endpoint);
int ipv6_;
size_t ipv6_size_ = sizeof (ipv6_);
TEST_ASSERT_SUCCESS_ERRNO (
zmq_getsockopt (server, ZMQ_IPV6, &ipv6_, &ipv6_size_));
TEST_ASSERT_SUCCESS_ERRNO (
zmq_setsockopt (client, ZMQ_IPV6, &ipv6_, sizeof (int)));
TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, server_endpoint)); TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, server_endpoint));
bounce (server, client); bounce (server, client);

11
tests/testutil_monitoring.hpp
View File

@ -32,9 +32,6 @@
#include "testutil.hpp" #include "testutil.hpp"
#define __STDC_FORMAT_MACROS
#include <inttypes.h>
// General, i.e. non-security specific, monitor utilities // General, i.e. non-security specific, monitor utilities
// Read one event off the monitor socket; return value and address // Read one event off the monitor socket; return value and address
@ -261,7 +258,7 @@ int64_t get_monitor_event_with_timeout_v2 (void *monitor_,
char **remote_address_, char **remote_address_,
int timeout_) int timeout_)
{ {
int res; int64_t res;
if (timeout_ == -1) { if (timeout_ == -1) {
// process infinite timeout in small steps to allow the user // process infinite timeout in small steps to allow the user
// to see some information on the console // to see some information on the console
@ -309,10 +306,8 @@ void expect_monitor_event_v2 (void *monitor_,
expected_remote_address_ ? &remote_address : NULL); expected_remote_address_ ? &remote_address : NULL);
bool failed = false; bool failed = false;
if (event != expected_event_) { if (event != expected_event_) {
fprintf (stderr, fprintf (stderr, "Expected monitor event %lld, but received %lld\n",
"Expected monitor event %" PRIx64 ", but received %" PRIx64 (long long) expected_event_, (long long) event);
"\n",
expected_event_, event);
failed = true; failed = true;
} }
if (expected_local_address_ if (expected_local_address_