4 files changed, 38 insertions, 10 deletions

diff --git a/src/platform/posix/posix_ipcconn.c b/src/platform/posix/posix_ipcconn.c
index 07ec6213..c9faded5 100644
--- a/src/platform/posix/posix_ipcconn.c
+++ b/src/platform/posix/posix_ipcconn.c
@@ -186,7 +186,7 @@ ipc_doread(ipc_conn *c)
 			// No bytes indicates a closed descriptor.
 			// This implicitly completes this (all!) aio.
 			nni_aio_list_remove(aio);
-			nni_aio_finish_error(aio, NNG_ECLOSED);
+			nni_aio_finish_error(aio, NNG_ECONNSHUT);
 			continue;
 		}
 
@@ -202,6 +202,22 @@ ipc_doread(ipc_conn *c)
 }
 
 static void
+ipc_error(void *arg, int err)
+{
+	ipc_conn *c = arg;
+	nni_aio *aio;
+
+	nni_mtx_lock(&c->mtx);
+	while (((aio = nni_list_first(&c->readq)) != NULL) ||
+	    ((aio = nni_list_first(&c->writeq)) != NULL)) {
+		nni_aio_list_remove(aio);
+		nni_aio_finish_error(aio, err);
+	}
+	nni_posix_pfd_close(c->pfd);
+	nni_mtx_unlock(&c->mtx);
+}
+
+static void
 ipc_close(void *arg)
 {
 	ipc_conn *c = arg;
@@ -225,7 +241,7 @@ ipc_cb(nni_posix_pfd *pfd, int events, void *arg)
 	ipc_conn *c = arg;
 
 	if (events & (POLLHUP | POLLERR | POLLNVAL)) {
-		ipc_close(c);
+		ipc_error(c, NNG_ECONNSHUT);
 		return;
 	}
 	nni_mtx_lock(&c->mtx);
diff --git a/src/platform/posix/posix_tcpconn.c b/src/platform/posix/posix_tcpconn.c
index 0d3c274d..6ca7013b 100644
--- a/src/platform/posix/posix_tcpconn.c
+++ b/src/platform/posix/posix_tcpconn.c
@@ -180,7 +180,7 @@ tcp_doread(nni_tcp_conn *c)
 			// No bytes indicates a closed descriptor.
 			// This implicitly completes this (all!) aio.
 			nni_aio_list_remove(aio);
-			nni_aio_finish_error(aio, NNG_ECLOSED);
+			nni_aio_finish_error(aio, NNG_ECONNSHUT);
 			continue;
 		}
 
@@ -196,6 +196,22 @@ tcp_doread(nni_tcp_conn *c)
 }
 
 static void
+tcp_error(void *arg, int err)
+{
+	nni_tcp_conn *c = arg;
+	nni_aio *aio;
+
+	nni_mtx_lock(&c->mtx);
+	while (((aio = nni_list_first(&c->readq)) != NULL) ||
+	    ((aio = nni_list_first(&c->writeq)) != NULL)) {
+		nni_aio_list_remove(aio);
+		nni_aio_finish_error(aio, err);
+	}
+	nni_posix_pfd_close(c->pfd);
+	nni_mtx_unlock(&c->mtx);
+}
+
+static void
 tcp_close(void *arg)
 {
 	nni_tcp_conn *c = arg;
@@ -242,7 +258,7 @@ tcp_cb(nni_posix_pfd *pfd, int events, void *arg)
 	nni_tcp_conn *c = arg;
 
 	if (events & (POLLHUP | POLLERR | POLLNVAL)) {
-		tcp_close(c);
+                tcp_error(c, NNG_ECONNSHUT);
 		return;
 	}
 	nni_mtx_lock(&c->mtx);
diff --git a/src/platform/windows/win_ipcconn.c b/src/platform/windows/win_ipcconn.c
index 4d267dd9..6aa30925 100644
--- a/src/platform/windows/win_ipcconn.c
+++ b/src/platform/windows/win_ipcconn.c
@@ -116,7 +116,7 @@ ipc_recv_cb(nni_win_io *io, int rv, size_t num)
 
 	if ((rv == 0) && (num == 0)) {
 		// A zero byte receive is a remote close from the peer.
-		rv = NNG_ECLOSED;
+		rv = NNG_ECONNSHUT;
 	}
 	nni_aio_finish_synch(aio, rv, num);
 }
@@ -240,10 +240,6 @@ ipc_send_cb(nni_win_io *io, int rv, size_t num)
 	}
 	nni_mtx_unlock(&c->mtx);
 
-	if ((rv == 0) && (num == 0)) {
-		// A zero byte receive is a remote close from the peer.
-		rv = NNG_ECLOSED;
-	}
 	nni_aio_finish_synch(aio, rv, num);
 }
 
diff --git a/src/platform/windows/win_tcpconn.c b/src/platform/windows/win_tcpconn.c
index 429c5a5d..bd464184 100644
--- a/src/platform/windows/win_tcpconn.c
+++ b/src/platform/windows/win_tcpconn.c
@@ -89,7 +89,7 @@ tcp_recv_cb(nni_win_io *io, int rv, size_t num)
 
 	if ((rv == 0) && (num == 0)) {
 		// A zero byte receive is a remote close from the peer.
-		rv = NNG_ECLOSED;
+		rv = NNG_ECONNSHUT;
 	}
 	nni_aio_finish_synch(aio, rv, num);
 }