Merge pull request #128 from calid/libzmq-949-backport

backport #949 fixes to 4-x stable

.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

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 ();

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_);

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_);

src/object.hpp

@@ -20,6 +20,7 @@
 #ifndef __ZMQ_OBJECT_HPP_INCLUDED__
 #define __ZMQ_OBJECT_HPP_INCLUDED__
 
+#include <string>
 #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_);

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
@@ -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 <inprocs_t::iterator, inprocs_t::iterator> range = inprocs.equal_range (std::string (addr_));
  if (range.first == range.second) {
  errno = ENOENT;

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

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 <http://www.gnu.org/licenses/>.
+*/
+
+#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;
+}

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 <http://www.gnu.org/licenses/>.
+*/
+
+#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;
+}