ctx: Simplify handling for closed contexts.

Once a context has started the process of close, further attempts
to close it will return NNG_ECLOSED.  What was I thinking to ever
do anything else?

2 files changed, 4 insertions, 7 deletions

diff --git a/src/core/socket.c b/src/core/socket.c
index 9b4ed308..fe1b62d2 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -1030,7 +1030,7 @@ nni_sock_set_pipe_cb(nni_sock *s, int ev, nng_pipe_cb cb, void *arg)
 }
 
 int
-nni_ctx_find(nni_ctx **cp, uint32_t id, bool closing)
+nni_ctx_find(nni_ctx **cp, uint32_t id)
 {
 	int      rv = 0;
 	nni_ctx *ctx;
@@ -1043,7 +1043,7 @@ nni_ctx_find(nni_ctx **cp, uint32_t id, bool closing)
 		// we can close it, then we still allow.  In the case
 		// the only valid operation will be to close the
 		// socket.)
-		if (ctx->c_closed || ((!closing) && ctx->c_sock->s_closed)) {
+		if (ctx->c_closed || ctx->c_sock->s_closed) {
 			rv = NNG_ECLOSED;
 		} else {
 			ctx->c_ref++;
diff --git a/src/core/socket.h b/src/core/socket.h
index 3eb943f4..af8fd97d 100644
--- a/src/core/socket.h
+++ b/src/core/socket.h
@@ -73,11 +73,8 @@ extern void nni_sock_set_pipe_cb(nni_sock *sock, int, nng_pipe_cb, void *);
 // sockets (will also return NNG_ENOTSUP).
 extern int nni_ctx_open(nni_ctx **, nni_sock *);
 
-// nni_ctx_find finds a context given its id.  The last argument should
-// be true if the context is acquired merely to close it, false otherwise.
-// (If the socket for the context is being closed, then this will return
-// NNG_ECLOSED unless the final argument is true.)
-extern int nni_ctx_find(nni_ctx **, uint32_t, bool);
+// nni_ctx_find finds a context given its id.
+extern int nni_ctx_find(nni_ctx **, uint32_t);
 
 extern void *nni_ctx_proto_data(nni_ctx *);