5 files changed, 19 insertions, 14 deletions
diff --git a/src/protocol/pair/pair.c b/src/protocol/pair/pair.c
index 30302352..f5fec540 100644
--- a/src/protocol/pair/pair.c
+++ b/src/protocol/pair/pair.c
@@ -1,5 +1,6 @@
 //
 // Copyright 2017 Garrett D'Amore <garrett@damore.org>
+// Copyright 2017 Capitar IT Group BV <info@capitar.com>
 //
 // This software is supplied under the terms of the MIT License, a
 // copy of which should be located in the distribution where this
@@ -157,10 +158,10 @@ nni_pair_pipe_stop(void *arg)
 	nni_pair_pipe *ppipe = arg;
 	nni_pair_sock *psock = ppipe->psock;
 
-	nni_aio_stop(&ppipe->aio_send);
-	nni_aio_stop(&ppipe->aio_recv);
-	nni_aio_stop(&ppipe->aio_putq);
-	nni_aio_stop(&ppipe->aio_getq);
+	nni_aio_cancel(&ppipe->aio_send, NNG_ECANCELED);
+	nni_aio_cancel(&ppipe->aio_recv, NNG_ECANCELED);
+	nni_aio_cancel(&ppipe->aio_putq, NNG_ECANCELED);
+	nni_aio_cancel(&ppipe->aio_getq, NNG_ECANCELED);
 
 	nni_mtx_lock(&psock->mtx);
 	if (psock->ppipe == ppipe) {
diff --git a/src/protocol/pipeline/pull.c b/src/protocol/pipeline/pull.c
index 80ff4245..39e809e6 100644
--- a/src/protocol/pipeline/pull.c
+++ b/src/protocol/pipeline/pull.c
@@ -1,5 +1,6 @@
 //
 // Copyright 2017 Garrett D'Amore <garrett@damore.org>
+// Copyright 2017 Capitar IT Group BV <info@capitar.com>
 //
 // This software is supplied under the terms of the MIT License, a
 // copy of which should be located in the distribution where this
@@ -112,8 +113,8 @@ nni_pull_pipe_stop(void *arg)
 {
 	nni_pull_pipe *pp = arg;
 
-	nni_aio_stop(&pp->putq_aio);
-	nni_aio_stop(&pp->recv_aio);
+	nni_aio_cancel(&pp->putq_aio, NNG_ECANCELED);
+	nni_aio_cancel(&pp->recv_aio, NNG_ECANCELED);
 }
 
 static void
diff --git a/src/protocol/pipeline/push.c b/src/protocol/pipeline/push.c
index f1da0a9f..43c0feaf 100644
--- a/src/protocol/pipeline/push.c
+++ b/src/protocol/pipeline/push.c
@@ -1,5 +1,6 @@
 //
 // Copyright 2017 Garrett D'Amore <garrett@damore.org>
+// Copyright 2017 Capitar IT Group BV <info@capitar.com>
 //
 // This software is supplied under the terms of the MIT License, a
 // copy of which should be located in the distribution where this
@@ -134,9 +135,9 @@ nni_push_pipe_stop(void *arg)
 	nni_push_pipe *pp   = arg;
 	nni_push_sock *push = pp->push;
 
-	nni_aio_stop(&pp->aio_recv);
-	nni_aio_stop(&pp->aio_send);
-	nni_aio_stop(&pp->aio_getq);
+	nni_aio_cancel(&pp->aio_recv, NNG_ECANCELED);
+	nni_aio_cancel(&pp->aio_send, NNG_ECANCELED);
+	nni_aio_cancel(&pp->aio_getq, NNG_ECANCELED);
 }
 
 static void
diff --git a/src/protocol/pubsub/pub.c b/src/protocol/pubsub/pub.c
index 64c2c59d..508ab7ce 100644
--- a/src/protocol/pubsub/pub.c
+++ b/src/protocol/pubsub/pub.c
@@ -1,5 +1,6 @@
 //
 // Copyright 2017 Garrett D'Amore <garrett@damore.org>
+// Copyright 2017 Capitar IT Group BV <info@capitar.com>
 //
 // This software is supplied under the terms of the MIT License, a
 // copy of which should be located in the distribution where this
@@ -171,9 +172,9 @@ nni_pub_pipe_stop(void *arg)
 	nni_pub_pipe *pp  = arg;
 	nni_pub_sock *pub = pp->pub;
 
-	nni_aio_stop(&pp->aio_getq);
-	nni_aio_stop(&pp->aio_send);
-	nni_aio_stop(&pp->aio_recv);
+	nni_aio_cancel(&pp->aio_getq, NNG_ECANCELED);
+	nni_aio_cancel(&pp->aio_send, NNG_ECANCELED);
+	nni_aio_cancel(&pp->aio_recv, NNG_ECANCELED);
 	nni_msgq_close(pp->sendq);
 
 	nni_mtx_lock(&pub->mtx);
diff --git a/src/protocol/pubsub/sub.c b/src/protocol/pubsub/sub.c
index bc4de973..36a42c49 100644
--- a/src/protocol/pubsub/sub.c
+++ b/src/protocol/pubsub/sub.c
@@ -1,5 +1,6 @@
 //
 // Copyright 2017 Garrett D'Amore <garrett@damore.org>
+// Copyright 2017 Capitar IT Group BV <info@capitar.com>
 //
 // This software is supplied under the terms of the MIT License, a
 // copy of which should be located in the distribution where this
@@ -122,8 +123,8 @@ nni_sub_pipe_stop(void *arg)
 {
 	nni_sub_pipe *sp = arg;
 
-	nni_aio_stop(&sp->aio_putq);
-	nni_aio_stop(&sp->aio_recv);
+	nni_aio_cancel(&sp->aio_putq, NNG_ECANCELED);
+	nni_aio_cancel(&sp->aio_recv, NNG_ECANCELED);
 }
 
 static void