From 8d59f91acdb0f31e2cab7cf19b159ed6b9196aa2 Mon Sep 17 00:00:00 2001 From: Dylan Cali Date: Sun, 28 Jun 2015 20:01:12 -0500 Subject: [PATCH 1/3] add tests for zeromq/libzmq#949 --- .gitignore | 2 ++ tests/Makefile.am | 4 +++ tests/test_unbind_inproc.cpp | 43 ++++++++++++++++++++++++++++++ tests/test_unbind_wildcard.cpp | 48 ++++++++++++++++++++++++++++++++++ 4 files changed, 97 insertions(+) create mode 100644 tests/test_unbind_inproc.cpp create mode 100644 tests/test_unbind_wildcard.cpp diff --git a/.gitignore b/.gitignore index 10a75677dd..ab9757b8c6 100644 --- a/.gitignore +++ b/.gitignore @@ -48,6 +48,8 @@ tests/test_immediate tests/test_term_endpoint tests/test_router_mandatory tests/test_disconnect_inproc +tests/test_unbind_inproc +tests/test_unbind_wildcard tests/test_raw_sock tests/test_disconnect_inproc tests/test_ctx_options diff --git a/tests/Makefile.am b/tests/Makefile.am index 31d7e096af..0a8fab8323 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -23,6 +23,8 @@ noinst_PROGRAMS = test_system \ test_probe_router \ test_stream \ test_disconnect_inproc \ + test_unbind_inproc \ + test_unbind_wildcard \ test_ctx_options \ test_ctx_destroy \ test_security_null \ @@ -72,6 +74,8 @@ test_router_raw_empty_SOURCES = test_router_raw_empty.cpp test_probe_router_SOURCES = test_probe_router.cpp test_stream_SOURCES = test_stream.cpp test_disconnect_inproc_SOURCES = test_disconnect_inproc.cpp +test_unbind_inproc_SOURCES = test_unbind_inproc.cpp +test_unbind_wildcard_SOURCES = test_unbind_wildcard.cpp test_ctx_options_SOURCES = test_ctx_options.cpp test_iov_SOURCES = test_iov.cpp test_ctx_destroy_SOURCES = test_ctx_destroy.cpp diff --git a/tests/test_unbind_inproc.cpp b/tests/test_unbind_inproc.cpp new file mode 100644 index 0000000000..2b1d8982b0 --- /dev/null +++ b/tests/test_unbind_inproc.cpp @@ -0,0 +1,43 @@ +/* + Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file + + This file is part of 0MQ. + + 0MQ is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + 0MQ is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . +*/ + +#include "testutil.hpp" + +int main (void) +{ + setup_test_environment(); + void *ctx = zmq_ctx_new (); + assert (ctx); + + void *sb = zmq_socket (ctx, ZMQ_REP); + assert (sb); + int rc = zmq_bind (sb, "inproc://a"); + assert (rc == 0); + + rc = zmq_unbind (sb, "inproc://a"); + assert (rc == 0); + + rc = zmq_close (sb); + assert (rc == 0); + + rc = zmq_ctx_term (ctx); + assert (rc == 0); + + return 0; +} diff --git a/tests/test_unbind_wildcard.cpp b/tests/test_unbind_wildcard.cpp new file mode 100644 index 0000000000..dae1d423ae --- /dev/null +++ b/tests/test_unbind_wildcard.cpp @@ -0,0 +1,48 @@ +/* + Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file + + This file is part of 0MQ. + + 0MQ is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + 0MQ is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . +*/ + +#include "testutil.hpp" + +int main (void) +{ + setup_test_environment(); + void *ctx = zmq_ctx_new (); + assert (ctx); + + void *sb = zmq_socket (ctx, ZMQ_REP); + assert (sb); + int rc = zmq_bind (sb, "tcp://*:5555"); + assert (rc == 0); + + char endpoint[256]; + size_t endpoint_len = sizeof (endpoint); + rc = zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, endpoint, &endpoint_len); + assert (rc == 0); + + rc = zmq_unbind (sb, endpoint); + assert (rc == 0); + + rc = zmq_close (sb); + assert (rc == 0); + + rc = zmq_ctx_term (ctx); + assert (rc == 0); + + return 0; +} From f1cec450db3bf7fa16e47b8917c8d6a48cbc3076 Mon Sep 17 00:00:00 2001 From: Dylan Cali Date: Sun, 28 Jun 2015 23:23:16 -0500 Subject: [PATCH 2/3] backport zeromq/libzmq@54e0fde fixes zmq_unbind failing with ENOENT --- src/ctx.cpp | 20 ++++++++++++++++++++ src/ctx.hpp | 1 + src/object.cpp | 6 ++++++ src/object.hpp | 3 +++ src/socket_base.cpp | 2 ++ 5 files changed, 32 insertions(+) diff --git a/src/ctx.cpp b/src/ctx.cpp index a06f36242a..167a608278 100644 --- a/src/ctx.cpp +++ b/src/ctx.cpp @@ -373,6 +373,26 @@ int zmq::ctx_t::register_endpoint (const char *addr_, endpoint_t &endpoint_) return 0; } +int zmq::ctx_t::unregister_endpoint ( + const std::string &addr_, socket_base_t *socket_) +{ + endpoints_sync.lock (); + + const endpoints_t::iterator it = endpoints.find (addr_); + if (it == endpoints.end () || it->second.socket != socket_) { + endpoints_sync.unlock (); + errno = ENOENT; + return -1; + } + + // Remove endpoint. + endpoints.erase (it); + + endpoints_sync.unlock (); + + return 0; +} + void zmq::ctx_t::unregister_endpoints (socket_base_t *socket_) { endpoints_sync.lock (); diff --git a/src/ctx.hpp b/src/ctx.hpp index 7473321956..9671c71b5a 100644 --- a/src/ctx.hpp +++ b/src/ctx.hpp @@ -107,6 +107,7 @@ namespace zmq // Management of inproc endpoints. int register_endpoint (const char *addr_, endpoint_t &endpoint_); + int unregister_endpoint (const std::string &addr_, socket_base_t *socket_); void unregister_endpoints (zmq::socket_base_t *socket_); endpoint_t find_endpoint (const char *addr_); void pend_connection (const char *addr_, pending_connection_t &pending_connection_); diff --git a/src/object.cpp b/src/object.cpp index e658b287e9..391ee19a4d 100644 --- a/src/object.cpp +++ b/src/object.cpp @@ -142,6 +142,12 @@ int zmq::object_t::register_endpoint (const char *addr_, endpoint_t &endpoint_) return ctx->register_endpoint (addr_, endpoint_); } +int zmq::object_t::unregister_endpoint ( + const std::string &addr_, socket_base_t *socket_) +{ + return ctx->unregister_endpoint (addr_, socket_); +} + void zmq::object_t::unregister_endpoints (socket_base_t *socket_) { return ctx->unregister_endpoints (socket_); diff --git a/src/object.hpp b/src/object.hpp index 7655c38fab..4b62e07305 100644 --- a/src/object.hpp +++ b/src/object.hpp @@ -20,6 +20,7 @@ #ifndef __ZMQ_OBJECT_HPP_INCLUDED__ #define __ZMQ_OBJECT_HPP_INCLUDED__ +#include #include "stdint.hpp" namespace zmq @@ -59,6 +60,8 @@ namespace zmq // Using following function, socket is able to access global // repository of inproc endpoints. int register_endpoint (const char *addr_, zmq::endpoint_t &endpoint_); + int unregister_endpoint ( + const std::string &addr_, socket_base_t *socket_); void unregister_endpoints (zmq::socket_base_t *socket_); zmq::endpoint_t find_endpoint (const char *addr_); void pend_connection (const char *addr_, pending_connection_t &pending_connection_); diff --git a/src/socket_base.cpp b/src/socket_base.cpp index eac2882735..abcf1792de 100644 --- a/src/socket_base.cpp +++ b/src/socket_base.cpp @@ -657,6 +657,8 @@ int zmq::socket_base_t::term_endpoint (const char *addr_) // Disconnect an inproc socket if (protocol == "inproc") { + if (unregister_endpoint (std::string (addr_), this) == 0) + return 0; std::pair range = inprocs.equal_range (std::string (addr_)); if (range.first == range.second) { errno = ENOENT; From d2574dd45fd565145909256a1803d7c2feb74c7c Mon Sep 17 00:00:00 2001 From: Dylan Cali Date: Sun, 28 Jun 2015 23:23:54 -0500 Subject: [PATCH 3/3] backport zeromq/libzmq@09e7416 fixes zmq_unbind failing for wildcard endpoints --- src/socket_base.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/socket_base.cpp b/src/socket_base.cpp index abcf1792de..a875149a3b 100644 --- a/src/socket_base.cpp +++ b/src/socket_base.cpp @@ -378,7 +378,7 @@ int zmq::socket_base_t::bind (const char *addr_) // Save last endpoint URI listener->get_address (last_endpoint); - add_endpoint (addr_, (own_t *) listener, NULL); + add_endpoint (last_endpoint.c_str (), (own_t *) listener, NULL); return 0; } @@ -397,7 +397,7 @@ int zmq::socket_base_t::bind (const char *addr_) // Save last endpoint URI listener->get_address (last_endpoint); - add_endpoint (addr_, (own_t *) listener, NULL); + add_endpoint (last_endpoint.c_str (), (own_t *) listener, NULL); return 0; } #endif