From 54e0fde1ccf37e5bb1591bf66e8ca01e8074a155 Mon Sep 17 00:00:00 2001
From: Martin Hurton <hurtonm@gmail.com>
Date: Wed, 9 Jul 2014 09:57:28 +0200
Subject: [PATCH] Resolve issue #949

---
 src/ctx.cpp         | 20 ++++++++++++++++++++
 src/ctx.hpp         |  1 +
 src/object.cpp      |  6 ++++++
 src/object.hpp      |  2 ++
 src/socket_base.cpp |  2 ++
 5 files changed, 31 insertions(+)

diff --git a/src/ctx.cpp b/src/ctx.cpp
index 929553ab..c3834fe6 100644
--- a/src/ctx.cpp
+++ b/src/ctx.cpp
@@ -386,6 +386,26 @@ int zmq::ctx_t::register_endpoint (const char *addr_,
     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 e4b9927f..b9382175 100644
--- a/src/ctx.hpp
+++ b/src/ctx.hpp
@@ -104,6 +104,7 @@ namespace zmq
 
         //  Management of inproc endpoints.
         int register_endpoint (const char *addr_, const 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 std::string &addr_,
diff --git a/src/object.cpp b/src/object.cpp
index 7bd9b804..cdd991a3 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -143,6 +143,12 @@ int zmq::object_t::register_endpoint (const char *addr_,
     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 714a14f5..ed9f45b5 100644
--- a/src/object.hpp
+++ b/src/object.hpp
@@ -61,6 +61,8 @@ namespace zmq
         //  repository of inproc endpoints.
         int register_endpoint (const char *addr_,
                 const 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 std::string &addr_,
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index a3592b22..b595c51c 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -743,6 +743,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;