fixes #136 consider eliminating nng_shutdown

4 files changed, 2 insertions, 47 deletions

diff --git a/src/nng.c b/src/nng.c
index bd403896..3f868b30 100644
--- a/src/nng.c
+++ b/src/nng.c
@@ -30,20 +30,6 @@ nng_fini(void)
 }
 
 int
-nng_shutdown(nng_socket sid)
-{
-	int       rv;
-	nni_sock *sock;
-
-	if ((rv = nni_sock_find(&sock, sid)) != 0) {
-		return (rv);
-	}
-	rv = nni_sock_shutdown(sock);
-	nni_sock_rele(sock);
-	return (rv);
-}
-
-int
 nng_close(nng_socket sid)
 {
 	int       rv;
diff --git a/src/nng.h b/src/nng.h
index d260e5fd..9e147df3 100644
--- a/src/nng.h
+++ b/src/nng.h
@@ -77,13 +77,6 @@ NNG_DECL int nng_close(nng_socket);
 // a library; it will affect all sockets.
 NNG_DECL void nng_closeall(void);
 
-// nng_shutdown shuts down the socket.  This causes any threads doing
-// work for the socket or blocked in socket functions to be woken (and
-// return NNG_ECLOSED).  The socket resources are still present, so it
-// is safe to call other functions; they will just return NNG_ECLOSED.
-// A call to nng_close is still required to release the resources.
-NNG_DECL int nng_shutdown(nng_socket);
-
 // nng_protocol returns the protocol number of the socket.
 NNG_DECL uint16_t nng_protocol(nng_socket);
 
diff --git a/tests/pipeline.c b/tests/pipeline.c
index a7718dd6..31f02798 100644
--- a/tests/pipeline.c
+++ b/tests/pipeline.c
@@ -79,7 +79,7 @@ TestMain("PIPELINE (PUSH/PULL) pattern", {
 		So(nng_listen(pull, addr, NULL, 0) == 0);
 		So(nng_dial(push, addr, NULL, 0) == 0);
 		So(nng_dial(what, addr, NULL, 0) == 0);
-		So(nng_shutdown(what) == 0);
+		So(nng_close(what) == 0);
 
 		nng_msleep(20);
 
@@ -146,7 +146,7 @@ TestMain("PIPELINE (PUSH/PULL) pattern", {
 		So(nng_dial(pull1, addr, NULL, 0) == 0);
 		So(nng_dial(pull2, addr, NULL, 0) == 0);
 		So(nng_dial(pull3, addr, NULL, 0) == 0);
-		So(nng_shutdown(pull3) == 0);
+		So(nng_close(pull3) == 0);
 
 		// So pull3 might not be done accepting yet, but pull1
 		// and pull2 definitely are, because otherwise the
diff --git a/tests/sock.c b/tests/sock.c
index 341bd263..cbe3d012 100644
--- a/tests/sock.c
+++ b/tests/sock.c
@@ -32,30 +32,6 @@ TestMain("Socket Operations", {
 
 		Reset({ nng_close(s1); });
 
-		Convey("And we can shut it down", {
-			char * buf;
-			size_t sz;
-			So(nng_shutdown(s1) == 0);
-			So(nng_shutdown(s1) == NNG_ECLOSED);
-			Convey("It can't receive", {
-				So(nng_recv(s1, &buf, &sz, NNG_FLAG_ALLOC) ==
-				    NNG_ECLOSED);
-			});
-			Convey("It can't send",
-			    { So(nng_send(s1, "", 0, 0) == NNG_ECLOSED); });
-			Convey("Cannot create endpoints", {
-				nng_dialer   d;
-				nng_listener l;
-				char *       a = "inproc://closed";
-				So(nng_dialer_create(&d, s1, a) ==
-				    NNG_ECLOSED);
-				So(nng_listener_create(&l, s1, a) ==
-				    NNG_ECLOSED);
-				So(nng_dial(s1, a, &d, 0) == NNG_ECLOSED);
-				So(nng_listen(s1, a, &l, 0) == NNG_ECLOSED);
-			});
-		});
-
 		Convey("It's type & peer are still PAIR", {
 			So(nng_protocol(s1) == NNG_PROTO_PAIR);
 			So(nng_peer(s1) == NNG_PROTO_PAIR);