generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-04 04:10:00 +01:00
Code Issues Projects Releases Wiki Activity

Problem: zmq_connect with IPv6 "source:port;dest:port" format is broken

Browse Source 
Solution: allow for '[' character when doing the basic sanity check
on the TCP endpoint.
Also add unit tests for both IPv4 and IPv6 source;dest format.
This commit is contained in:
Luca Boccassi
2016-09-17 19:18:09 +01:00
parent c1d07c6cd6
commit 53e5a9a6f9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/socket_base.cpp
View File

@@ -843,7 +843,7 @@ int zmq::socket_base_t::connect (const char *addr_)
while (isalnum (*check) while (isalnum (*check)
|| isxdigit (*check) || isxdigit (*check)
|| *check == '.' || *check == '-' || *check == ':' || *check == '%' || *check == '.' || *check == '-' || *check == ':' || *check == '%'
|| *check == ';' || *check == ']' || *check == '_' || *check == ';' || *check == '[' || *check == ']' || *check == '_'
) { ) {
check++; check++;
} }

8
tests/test_reqrep_tcp.cpp
View File

@@ -88,7 +88,7 @@ void test_multi_connect_ipv4 (void)
assert (rc == 0); assert (rc == 0);
rc = zmq_connect (sc, "tcp://127.0.0.1:5561"); rc = zmq_connect (sc, "tcp://127.0.0.1:5561");
assert (rc == 0); assert (rc == 0);
rc = zmq_connect (sc, "tcp://127.0.0.1:5562"); rc = zmq_connect (sc, "tcp://127.0.0.1:5564;127.0.0.1:5562");
assert (rc == 0); assert (rc == 0);
bounce (sb0, sc); bounce (sb0, sc);
@@ -101,7 +101,7 @@ void test_multi_connect_ipv4 (void)
rc = zmq_disconnect (sc, "tcp://127.0.0.1:5560"); rc = zmq_disconnect (sc, "tcp://127.0.0.1:5560");
assert (rc == 0); assert (rc == 0);
rc = zmq_disconnect (sc, "tcp://127.0.0.1:5562"); rc = zmq_disconnect (sc, "tcp://127.0.0.1:5564;127.0.0.1:5562");
assert (rc == 0); assert (rc == 0);
rc = zmq_disconnect (sc, "tcp://127.0.0.1:5561"); rc = zmq_disconnect (sc, "tcp://127.0.0.1:5561");
assert (rc == 0); assert (rc == 0);
@@ -214,7 +214,7 @@ void test_multi_connect_ipv6 (void)
assert (rc == 0); assert (rc == 0);
rc = zmq_connect (sc, "tcp://[::1]:5561"); rc = zmq_connect (sc, "tcp://[::1]:5561");
assert (rc == 0); assert (rc == 0);
rc = zmq_connect (sc, "tcp://[::1]:5562"); rc = zmq_connect (sc, "tcp://[::1]:5564;[::1]:5562");
assert (rc == 0); assert (rc == 0);
bounce (sb0, sc); bounce (sb0, sc);
@@ -227,7 +227,7 @@ void test_multi_connect_ipv6 (void)
rc = zmq_disconnect (sc, "tcp://[::1]:5560"); rc = zmq_disconnect (sc, "tcp://[::1]:5560");
assert (rc == 0); assert (rc == 0);
rc = zmq_disconnect (sc, "tcp://[::1]:5562"); rc = zmq_disconnect (sc, "tcp://[::1]:5564;[::1]:5562");
assert (rc == 0); assert (rc == 0);
rc = zmq_disconnect (sc, "tcp://[::1]:5561"); rc = zmq_disconnect (sc, "tcp://[::1]:5561");
assert (rc == 0); assert (rc == 0);