diff options
47 files changed, 79 insertions, 78 deletions
diff --git a/include/nng/nng.h b/include/nng/nng.h index 574a0427..21d7f290 100644 --- a/include/nng/nng.h +++ b/include/nng/nng.h @@ -680,7 +680,7 @@ NNG_DECL void nng_aio_finish(nng_aio *, int); // This returns false if the operation cannot be deferred (because the AIO // has been stopped with nng_aio_stop.) If it does so, then the aio's // completion callback will fire with a result of NNG_ESTOPPED. -typedef void (*nng_aio_cancelfn)(nng_aio *, void *, int); +typedef void (*nng_aio_cancelfn)(nng_aio *, void *, nng_err); NNG_DECL bool nng_aio_start(nng_aio *, nng_aio_cancelfn, void *); // nng_aio_sleep does a "sleeping" operation, basically does nothing diff --git a/src/core/aio.c b/src/core/aio.c index 9b0fe4d5..4c4c78b6 100644 --- a/src/core/aio.c +++ b/src/core/aio.c @@ -762,7 +762,7 @@ nni_aio_iov_advance(nni_aio *aio, size_t n) } static void -nni_sleep_cancel(nng_aio *aio, void *arg, int rv) +nni_sleep_cancel(nng_aio *aio, void *arg, nng_err rv) { NNI_ARG_UNUSED(arg); nni_aio_expire_q *eq = aio->a_expire_q; diff --git a/src/core/aio.h b/src/core/aio.h index a1b06e1d..5884e253 100644 --- a/src/core/aio.h +++ b/src/core/aio.h @@ -17,7 +17,7 @@ #include "core/taskq.h" #include "core/thread.h" -typedef void (*nni_aio_cancel_fn)(nni_aio *, void *, int); +typedef void (*nni_aio_cancel_fn)(nni_aio *, void *, nng_err); // nni_aio_init initializes an aio object. The callback is called with // the supplied argument when the operation is complete. If NULL is diff --git a/src/core/aio_test.c b/src/core/aio_test.c index 01765dce..99060349 100644 --- a/src/core/aio_test.c +++ b/src/core/aio_test.c @@ -25,7 +25,7 @@ sleep_done(void *arg) } static void -cancel(nng_aio *aio, void *arg, int rv) +cancel(nng_aio *aio, void *arg, nng_err rv) { *(int *) arg = rv; nng_aio_finish(aio, rv); diff --git a/src/core/device.c b/src/core/device.c index 24ba5499..68ab2f38 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -1,5 +1,5 @@ // -// Copyright 2024 Staysail Systems, Inc. <info@staysail.com> +// Copyright 2025 Staysail Systems, Inc. <info@staysail.com> // Copyright 2018 Capitar IT Group BV <info@capitar.com> // // This software is supplied under the terms of the MIT License, a @@ -60,7 +60,7 @@ device_fini(void *arg) } static void -device_cancel(nni_aio *aio, void *arg, int rv) +device_cancel(nni_aio *aio, void *arg, nng_err rv) { device_data *d = arg; // cancellation is the only path to shutting it down. diff --git a/src/core/msgqueue.c b/src/core/msgqueue.c index f0f2de8b..5d33fd94 100644 --- a/src/core/msgqueue.c +++ b/src/core/msgqueue.c @@ -197,7 +197,7 @@ nni_msgq_run_notify(nni_msgq *mq) } static void -nni_msgq_cancel(nni_aio *aio, void *arg, int rv) +nni_msgq_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_msgq *mq = arg; diff --git a/src/core/sockfd.c b/src/core/sockfd.c index ce0c6772..758cb755 100644 --- a/src/core/sockfd.c +++ b/src/core/sockfd.c @@ -99,7 +99,7 @@ sfd_start_conn(sfd_listener *l, nni_aio *aio) } static void -sfd_cancel_accept(nni_aio *aio, void *arg, int rv) +sfd_cancel_accept(nni_aio *aio, void *arg, nng_err rv) { sfd_listener *l = arg; diff --git a/src/core/tcp.c b/src/core/tcp.c index b0ed75fb..f7a30ed2 100644 --- a/src/core/tcp.c +++ b/src/core/tcp.c @@ -35,7 +35,7 @@ typedef struct { } tcp_dialer; static void -tcp_dial_cancel(nni_aio *aio, void *arg, int rv) +tcp_dial_cancel(nni_aio *aio, void *arg, nng_err rv) { tcp_dialer *d = arg; diff --git a/src/platform/posix/posix_ipcconn.c b/src/platform/posix/posix_ipcconn.c index 41676340..a585bafd 100644 --- a/src/platform/posix/posix_ipcconn.c +++ b/src/platform/posix/posix_ipcconn.c @@ -231,7 +231,7 @@ ipc_cb(void *arg, unsigned events) } static void -ipc_cancel(nni_aio *aio, void *arg, int rv) +ipc_cancel(nni_aio *aio, void *arg, nng_err rv) { ipc_conn *c = arg; diff --git a/src/platform/posix/posix_ipcdial.c b/src/platform/posix/posix_ipcdial.c index e106cfc9..d299f947 100644 --- a/src/platform/posix/posix_ipcdial.c +++ b/src/platform/posix/posix_ipcdial.c @@ -82,7 +82,7 @@ nni_posix_ipc_dialer_rele(ipc_dialer *d) } static void -ipc_dialer_cancel(nni_aio *aio, void *arg, int rv) +ipc_dialer_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_ipc_dialer *d = arg; nni_ipc_conn *c; diff --git a/src/platform/posix/posix_ipclisten.c b/src/platform/posix/posix_ipclisten.c index d13ac063..98432f71 100644 --- a/src/platform/posix/posix_ipclisten.c +++ b/src/platform/posix/posix_ipclisten.c @@ -164,7 +164,7 @@ ipc_listener_cb(void *arg, unsigned events) } static void -ipc_listener_cancel(nni_aio *aio, void *arg, int rv) +ipc_listener_cancel(nni_aio *aio, void *arg, nng_err rv) { ipc_listener *l = arg; diff --git a/src/platform/posix/posix_resolv_gai.c b/src/platform/posix/posix_resolv_gai.c index c5051ffd..2eba891b 100644 --- a/src/platform/posix/posix_resolv_gai.c +++ b/src/platform/posix/posix_resolv_gai.c @@ -54,7 +54,7 @@ static nni_mtx resolv_mtx; static nni_cv resolv_cv; static void -resolv_cancel(nni_aio *aio, void *arg, int rv) +resolv_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_resolv_item *item = arg; diff --git a/src/platform/posix/posix_sockfd.c b/src/platform/posix/posix_sockfd.c index bc397fc6..bc411252 100644 --- a/src/platform/posix/posix_sockfd.c +++ b/src/platform/posix/posix_sockfd.c @@ -261,7 +261,7 @@ sfd_cb(void *arg, unsigned events) } static void -sfd_cancel(nni_aio *aio, void *arg, int rv) +sfd_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_sfd_conn *c = arg; diff --git a/src/platform/posix/posix_tcpconn.c b/src/platform/posix/posix_tcpconn.c index 920c3ff9..9b61a68e 100644 --- a/src/platform/posix/posix_tcpconn.c +++ b/src/platform/posix/posix_tcpconn.c @@ -266,7 +266,7 @@ tcp_cb(void *arg, unsigned events) } static void -tcp_cancel(nni_aio *aio, void *arg, int rv) +tcp_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_tcp_conn *c = arg; diff --git a/src/platform/posix/posix_tcpdial.c b/src/platform/posix/posix_tcpdial.c index 7b2f09a9..52807892 100644 --- a/src/platform/posix/posix_tcpdial.c +++ b/src/platform/posix/posix_tcpdial.c @@ -113,7 +113,7 @@ nni_posix_tcp_dialer_rele(nni_tcp_dialer *d) } static void -tcp_dialer_cancel(nni_aio *aio, void *arg, int rv) +tcp_dialer_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_tcp_dialer *d = arg; nni_tcp_conn *c; diff --git a/src/platform/posix/posix_tcplisten.c b/src/platform/posix/posix_tcplisten.c index 29b5ea65..13ecb33e 100644 --- a/src/platform/posix/posix_tcplisten.c +++ b/src/platform/posix/posix_tcplisten.c @@ -1,5 +1,5 @@ // -// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech> // Copyright 2018 Capitar IT Group BV <info@capitar.com> // Copyright 2018 Devolutions <info@devolutions.net> // @@ -161,7 +161,7 @@ tcp_listener_cb(void *arg, unsigned events) } static void -tcp_listener_cancel(nni_aio *aio, void *arg, int rv) +tcp_listener_cancel(nni_aio *aio, void *arg, nng_err rv) { tcp_listener *l = arg; diff --git a/src/platform/posix/posix_udp.c b/src/platform/posix/posix_udp.c index 14bb6c22..b643d0b2 100644 --- a/src/platform/posix/posix_udp.c +++ b/src/platform/posix/posix_udp.c @@ -377,7 +377,7 @@ nni_plat_udp_close(nni_plat_udp *udp) } void -nni_plat_udp_cancel(nni_aio *aio, void *arg, int rv) +nni_plat_udp_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_plat_udp *udp = arg; diff --git a/src/platform/windows/win_ipcconn.c b/src/platform/windows/win_ipcconn.c index 353d703f..5493d32f 100644 --- a/src/platform/windows/win_ipcconn.c +++ b/src/platform/windows/win_ipcconn.c @@ -138,7 +138,7 @@ ipc_recv_cb(nni_win_io *io, int rv, size_t num) } static void -ipc_recv_cancel(nni_aio *aio, void *arg, int rv) +ipc_recv_cancel(nni_aio *aio, void *arg, nng_err rv) { ipc_conn *c = arg; nni_mtx_lock(&c->mtx); diff --git a/src/platform/windows/win_ipcdial.c b/src/platform/windows/win_ipcdial.c index d5e44750..43c1f744 100644 --- a/src/platform/windows/win_ipcdial.c +++ b/src/platform/windows/win_ipcdial.c @@ -1,5 +1,5 @@ // -// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech> // Copyright 2018 Capitar IT Group BV <info@capitar.com> // Copyright 2019 Devolutions <info@devolutions.net> // @@ -123,7 +123,7 @@ ipc_dial_thr(void *arg) } static void -ipc_dial_cancel(nni_aio *aio, void *arg, int rv) +ipc_dial_cancel(nni_aio *aio, void *arg, nng_err rv) { ipc_dialer *d = arg; ipc_dial_work *w = &ipc_connector; diff --git a/src/platform/windows/win_ipclisten.c b/src/platform/windows/win_ipclisten.c index cb37ef88..e40f51d7 100644 --- a/src/platform/windows/win_ipclisten.c +++ b/src/platform/windows/win_ipclisten.c @@ -1,5 +1,5 @@ // -// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech> // Copyright 2018 Capitar IT Group BV <info@capitar.com> // Copyright 2019 Devolutions <info@devolutions.net> // @@ -245,7 +245,7 @@ ipc_listener_listen(void *arg) } static void -ipc_accept_cancel(nni_aio *aio, void *arg, int rv) +ipc_accept_cancel(nni_aio *aio, void *arg, nng_err rv) { ipc_listener *l = arg; diff --git a/src/platform/windows/win_tcpconn.c b/src/platform/windows/win_tcpconn.c index e8e66f0e..e6d30b7a 100644 --- a/src/platform/windows/win_tcpconn.c +++ b/src/platform/windows/win_tcpconn.c @@ -1,5 +1,5 @@ // -// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech> // Copyright 2018 Capitar IT Group BV <info@capitar.com> // Copyright 2018 Devolutions <info@devolutions.net> // @@ -96,7 +96,7 @@ tcp_recv_cb(nni_win_io *io, int rv, size_t num) } static void -tcp_recv_cancel(nni_aio *aio, void *arg, int rv) +tcp_recv_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_tcp_conn *c = arg; nni_mtx_lock(&c->mtx); diff --git a/src/platform/windows/win_tcpdial.c b/src/platform/windows/win_tcpdial.c index 12bedf0a..4d3771f2 100644 --- a/src/platform/windows/win_tcpdial.c +++ b/src/platform/windows/win_tcpdial.c @@ -1,5 +1,5 @@ // -// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech> // Copyright 2018 Capitar IT Group BV <info@capitar.com> // Copyright 2018 Devolutions <info@devolutions.net> // @@ -96,7 +96,7 @@ nni_tcp_dialer_fini(nni_tcp_dialer *d) } static void -tcp_dial_cancel(nni_aio *aio, void *arg, int rv) +tcp_dial_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_tcp_dialer *d = arg; nni_tcp_conn *c; diff --git a/src/platform/windows/win_tcplisten.c b/src/platform/windows/win_tcplisten.c index 91ecccb0..c8c6ab2c 100644 --- a/src/platform/windows/win_tcplisten.c +++ b/src/platform/windows/win_tcplisten.c @@ -1,5 +1,5 @@ // -// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech> // Copyright 2018 Capitar IT Group BV <info@capitar.com> // Copyright 2018 Devolutions <info@devolutions.net> // @@ -196,7 +196,7 @@ tcp_listener_listen(void *arg) } static void -tcp_accept_cancel(nni_aio *aio, void *arg, int rv) +tcp_accept_cancel(nni_aio *aio, void *arg, nng_err rv) { tcp_listener *l = arg; diff --git a/src/platform/windows/win_udp.c b/src/platform/windows/win_udp.c index 0ff3ca1c..709ef82e 100644 --- a/src/platform/windows/win_udp.c +++ b/src/platform/windows/win_udp.c @@ -169,7 +169,7 @@ nni_plat_udp_send(nni_plat_udp *u, nni_aio *aio) } static void -udp_recv_cancel(nni_aio *aio, void *arg, int rv) +udp_recv_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_plat_udp *u = arg; nni_mtx_lock(&u->lk); diff --git a/src/sp/protocol/bus0/bus.c b/src/sp/protocol/bus0/bus.c index 99c3a9bf..13abfd6b 100644 --- a/src/sp/protocol/bus0/bus.c +++ b/src/sp/protocol/bus0/bus.c @@ -318,7 +318,7 @@ bus0_sock_send(void *arg, nni_aio *aio) } static void -bus0_recv_cancel(nng_aio *aio, void *arg, int rv) +bus0_recv_cancel(nng_aio *aio, void *arg, nng_err rv) { bus0_sock *s = arg; nni_mtx_lock(&s->mtx); diff --git a/src/sp/protocol/pair0/pair.c b/src/sp/protocol/pair0/pair.c index e577738b..5dc7f67a 100644 --- a/src/sp/protocol/pair0/pair.c +++ b/src/sp/protocol/pair0/pair.c @@ -137,7 +137,7 @@ pair0_pipe_init(void *arg, nni_pipe *pipe, void *pair) } static void -pair0_cancel(nni_aio *aio, void *arg, int rv) +pair0_cancel(nni_aio *aio, void *arg, nng_err rv) { pair0_sock *s = arg; diff --git a/src/sp/protocol/pair1/pair.c b/src/sp/protocol/pair1/pair.c index 65ee66ad..35e87b7b 100644 --- a/src/sp/protocol/pair1/pair.c +++ b/src/sp/protocol/pair1/pair.c @@ -248,7 +248,7 @@ pair1_pipe_init(void *arg, nni_pipe *pipe, void *pair) } static void -pair1_cancel(nni_aio *aio, void *arg, int rv) +pair1_cancel(nni_aio *aio, void *arg, nng_err rv) { pair1_sock *s = arg; diff --git a/src/sp/protocol/pipeline0/pull.c b/src/sp/protocol/pipeline0/pull.c index 64438304..d808180a 100644 --- a/src/sp/protocol/pipeline0/pull.c +++ b/src/sp/protocol/pipeline0/pull.c @@ -205,7 +205,7 @@ pull0_sock_send(void *arg, nni_aio *aio) } static void -pull0_cancel(nni_aio *aio, void *arg, int rv) +pull0_cancel(nni_aio *aio, void *arg, nng_err rv) { pull0_sock *s = arg; nni_mtx_lock(&s->m); diff --git a/src/sp/protocol/pipeline0/push.c b/src/sp/protocol/pipeline0/push.c index 4cf14a6e..4260f333 100644 --- a/src/sp/protocol/pipeline0/push.c +++ b/src/sp/protocol/pipeline0/push.c @@ -249,7 +249,7 @@ push0_send_cb(void *arg) } static void -push0_cancel(nni_aio *aio, void *arg, int rv) +push0_cancel(nni_aio *aio, void *arg, nng_err rv) { push0_sock *s = arg; diff --git a/src/sp/protocol/pubsub0/sub.c b/src/sp/protocol/pubsub0/sub.c index 97324571..6744e909 100644 --- a/src/sp/protocol/pubsub0/sub.c +++ b/src/sp/protocol/pubsub0/sub.c @@ -76,7 +76,7 @@ struct sub0_pipe { }; static void -sub0_ctx_cancel(nng_aio *aio, void *arg, int rv) +sub0_ctx_cancel(nng_aio *aio, void *arg, nng_err rv) { sub0_ctx *ctx = arg; sub0_sock *sock = ctx->sock; diff --git a/src/sp/protocol/reqrep0/rep.c b/src/sp/protocol/reqrep0/rep.c index 4a30e967..e84440a7 100644 --- a/src/sp/protocol/reqrep0/rep.c +++ b/src/sp/protocol/reqrep0/rep.c @@ -111,7 +111,7 @@ rep0_ctx_init(void *carg, void *sarg) } static void -rep0_ctx_cancel_send(nni_aio *aio, void *arg, int rv) +rep0_ctx_cancel_send(nni_aio *aio, void *arg, nng_err rv) { rep0_ctx *ctx = arg; rep0_sock *s = ctx->sock; @@ -400,7 +400,7 @@ rep0_pipe_send_cb(void *arg) } static void -rep0_cancel_recv(nni_aio *aio, void *arg, int rv) +rep0_cancel_recv(nni_aio *aio, void *arg, nng_err rv) { rep0_ctx *ctx = arg; rep0_sock *s = ctx->sock; diff --git a/src/sp/protocol/reqrep0/req.c b/src/sp/protocol/reqrep0/req.c index 6ddf958a..52f97d3a 100644 --- a/src/sp/protocol/reqrep0/req.c +++ b/src/sp/protocol/reqrep0/req.c @@ -536,7 +536,8 @@ req0_run_send_queue(req0_sock *s, nni_aio_completions *sent_list) // At this point, we will never give this message back to // the user, so we don't have to worry about making it // unique. We can freely clone it. - // But only do so if we need to hang onto it (for potential retries) + // But only do so if we need to hang onto it (for potential + // retries) if (ctx->retry > 0) { nni_msg_clone(ctx->req_msg); } @@ -573,7 +574,7 @@ req0_ctx_reset(req0_ctx *ctx) } static void -req0_ctx_cancel_recv(nni_aio *aio, void *arg, int rv) +req0_ctx_cancel_recv(nni_aio *aio, void *arg, nng_err rv) { req0_ctx *ctx = arg; req0_sock *s = ctx->sock; @@ -661,7 +662,7 @@ req0_ctx_recv(void *arg, nni_aio *aio) } static void -req0_ctx_cancel_send(nni_aio *aio, void *arg, int rv) +req0_ctx_cancel_send(nni_aio *aio, void *arg, nng_err rv) { req0_ctx *ctx = arg; req0_sock *s = ctx->sock; diff --git a/src/sp/protocol/survey0/respond.c b/src/sp/protocol/survey0/respond.c index a7cdf132..ace2962a 100644 --- a/src/sp/protocol/survey0/respond.c +++ b/src/sp/protocol/survey0/respond.c @@ -117,7 +117,7 @@ resp0_ctx_init(void *carg, void *sarg) } static void -resp0_ctx_cancel_send(nni_aio *aio, void *arg, int rv) +resp0_ctx_cancel_send(nni_aio *aio, void *arg, nng_err rv) { resp0_ctx *ctx = arg; resp0_sock *s = ctx->sock; @@ -398,7 +398,7 @@ resp0_pipe_send_cb(void *arg) } static void -resp0_cancel_recv(nni_aio *aio, void *arg, int rv) +resp0_cancel_recv(nni_aio *aio, void *arg, nng_err rv) { resp0_ctx *ctx = arg; resp0_sock *s = ctx->sock; diff --git a/src/sp/protocol/survey0/survey.c b/src/sp/protocol/survey0/survey.c index 6cf73e66..c64f0bb0 100644 --- a/src/sp/protocol/survey0/survey.c +++ b/src/sp/protocol/survey0/survey.c @@ -133,7 +133,7 @@ surv0_ctx_init(void *c, void *s) } static void -surv0_ctx_cancel(nni_aio *aio, void *arg, int rv) +surv0_ctx_cancel(nni_aio *aio, void *arg, nng_err rv) { surv0_ctx *ctx = arg; surv0_sock *sock = ctx->sock; diff --git a/src/sp/transport/inproc/inproc.c b/src/sp/transport/inproc/inproc.c index 672c4d33..1c7b88e6 100644 --- a/src/sp/transport/inproc/inproc.c +++ b/src/sp/transport/inproc/inproc.c @@ -176,7 +176,7 @@ inproc_queue_run(inproc_queue *queue) } static void -inproc_queue_cancel(nni_aio *aio, void *arg, int rv) +inproc_queue_cancel(nni_aio *aio, void *arg, nng_err rv) { inproc_queue *queue = arg; @@ -433,7 +433,7 @@ inproc_accept_clients(inproc_ep *srv) } static void -inproc_ep_cancel(nni_aio *aio, void *arg, int rv) +inproc_ep_cancel(nni_aio *aio, void *arg, nng_err rv) { inproc_ep *ep = arg; diff --git a/src/sp/transport/ipc/ipc.c b/src/sp/transport/ipc/ipc.c index 5fea1632..82ec3f7e 100644 --- a/src/sp/transport/ipc/ipc.c +++ b/src/sp/transport/ipc/ipc.c @@ -413,7 +413,7 @@ error: } static void -ipc_pipe_send_cancel(nni_aio *aio, void *arg, int rv) +ipc_pipe_send_cancel(nni_aio *aio, void *arg, nng_err rv) { ipc_pipe *p = arg; @@ -500,7 +500,7 @@ ipc_pipe_send(void *arg, nni_aio *aio) } static void -ipc_pipe_recv_cancel(nni_aio *aio, void *arg, int rv) +ipc_pipe_recv_cancel(nni_aio *aio, void *arg, nng_err rv) { ipc_pipe *p = arg; @@ -835,7 +835,7 @@ ipc_ep_init_listener(void *arg, nng_url *url, nni_listener *listener) } static void -ipc_ep_cancel(nni_aio *aio, void *arg, int rv) +ipc_ep_cancel(nni_aio *aio, void *arg, nng_err rv) { ipc_ep *ep = arg; nni_mtx_lock(&ep->mtx); diff --git a/src/sp/transport/socket/sockfd.c b/src/sp/transport/socket/sockfd.c index 9eea18f6..5138afaa 100644 --- a/src/sp/transport/socket/sockfd.c +++ b/src/sp/transport/socket/sockfd.c @@ -382,7 +382,7 @@ recv_error: } static void -sfd_tran_pipe_send_cancel(nni_aio *aio, void *arg, int rv) +sfd_tran_pipe_send_cancel(nni_aio *aio, void *arg, nng_err rv) { sfd_tran_pipe *p = arg; @@ -470,7 +470,7 @@ sfd_tran_pipe_send(void *arg, nni_aio *aio) } static void -sfd_tran_pipe_recv_cancel(nni_aio *aio, void *arg, int rv) +sfd_tran_pipe_recv_cancel(nni_aio *aio, void *arg, nng_err rv) { sfd_tran_pipe *p = arg; @@ -728,7 +728,7 @@ sfd_tran_listener_init(void *arg, nng_url *url, nni_listener *nlistener) } static void -sfd_tran_ep_cancel(nni_aio *aio, void *arg, int rv) +sfd_tran_ep_cancel(nni_aio *aio, void *arg, nng_err rv) { sfd_tran_ep *ep = arg; nni_mtx_lock(&ep->mtx); diff --git a/src/sp/transport/tcp/tcp.c b/src/sp/transport/tcp/tcp.c index c59ec5aa..3bc124ee 100644 --- a/src/sp/transport/tcp/tcp.c +++ b/src/sp/transport/tcp/tcp.c @@ -1,5 +1,5 @@ // -// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech> // Copyright 2018 Capitar IT Group BV <info@capitar.com> // Copyright 2019 Devolutions <info@devolutions.net> // @@ -402,7 +402,7 @@ recv_error: } static void -tcptran_pipe_send_cancel(nni_aio *aio, void *arg, int rv) +tcptran_pipe_send_cancel(nni_aio *aio, void *arg, nng_err rv) { tcptran_pipe *p = arg; @@ -491,7 +491,7 @@ tcptran_pipe_send(void *arg, nni_aio *aio) } static void -tcptran_pipe_recv_cancel(nni_aio *aio, void *arg, int rv) +tcptran_pipe_recv_cancel(nni_aio *aio, void *arg, nng_err rv) { tcptran_pipe *p = arg; @@ -846,7 +846,7 @@ tcptran_listener_init(void *arg, nng_url *url, nni_listener *nlistener) } static void -tcptran_ep_cancel(nni_aio *aio, void *arg, int rv) +tcptran_ep_cancel(nni_aio *aio, void *arg, nng_err rv) { tcptran_ep *ep = arg; nni_mtx_lock(&ep->mtx); diff --git a/src/sp/transport/tls/tls.c b/src/sp/transport/tls/tls.c index ed4fad05..643146f7 100644 --- a/src/sp/transport/tls/tls.c +++ b/src/sp/transport/tls/tls.c @@ -395,7 +395,7 @@ recv_error: } static void -tlstran_pipe_send_cancel(nni_aio *aio, void *arg, int rv) +tlstran_pipe_send_cancel(nni_aio *aio, void *arg, nng_err rv) { tlstran_pipe *p = arg; @@ -476,7 +476,7 @@ tlstran_pipe_send(void *arg, nni_aio *aio) } static void -tlstran_pipe_recv_cancel(nni_aio *aio, void *arg, int rv) +tlstran_pipe_recv_cancel(nni_aio *aio, void *arg, nng_err rv) { tlstran_pipe *p = arg; @@ -815,7 +815,7 @@ tlstran_ep_init_listener(void *arg, nng_url *url, nni_listener *nlistener) } static void -tlstran_ep_cancel(nni_aio *aio, void *arg, int rv) +tlstran_ep_cancel(nni_aio *aio, void *arg, nng_err rv) { tlstran_ep *ep = arg; nni_mtx_lock(&ep->mtx); diff --git a/src/sp/transport/udp/udp.c b/src/sp/transport/udp/udp.c index b068be03..2e85fd0f 100644 --- a/src/sp/transport/udp/udp.c +++ b/src/sp/transport/udp/udp.c @@ -999,7 +999,7 @@ udp_pipe_send(void *arg, nni_aio *aio) } static void -udp_pipe_recv_cancel(nni_aio *aio, void *arg, int rv) +udp_pipe_recv_cancel(nni_aio *aio, void *arg, nng_err rv) { udp_pipe *p = arg; udp_ep *ep = p->ep; @@ -1430,7 +1430,7 @@ udp_listener_init(void *arg, nng_url *url, nni_listener *nlistener) } static void -udp_ep_cancel(nni_aio *aio, void *arg, int rv) +udp_ep_cancel(nni_aio *aio, void *arg, nng_err rv) { udp_ep *ep = arg; nni_mtx_lock(&ep->mtx); diff --git a/src/sp/transport/ws/websocket.c b/src/sp/transport/ws/websocket.c index 23256edc..f93b1f49 100644 --- a/src/sp/transport/ws/websocket.c +++ b/src/sp/transport/ws/websocket.c @@ -106,7 +106,7 @@ wstran_pipe_recv_cb(void *arg) } static void -wstran_pipe_recv_cancel(nni_aio *aio, void *arg, int rv) +wstran_pipe_recv_cancel(nni_aio *aio, void *arg, nng_err rv) { ws_pipe *p = arg; nni_mtx_lock(&p->mtx); @@ -137,7 +137,7 @@ wstran_pipe_recv(void *arg, nni_aio *aio) } static void -wstran_pipe_send_cancel(nni_aio *aio, void *arg, int rv) +wstran_pipe_send_cancel(nni_aio *aio, void *arg, nng_err rv) { ws_pipe *p = arg; nni_mtx_lock(&p->mtx); @@ -241,7 +241,7 @@ wstran_listener_bind(void *arg, nng_url *url) } static void -wstran_listener_cancel(nni_aio *aio, void *arg, int rv) +wstran_listener_cancel(nni_aio *aio, void *arg, nng_err rv) { ws_listener *l = arg; @@ -277,7 +277,7 @@ wstran_listener_accept(void *arg, nni_aio *aio) } static void -wstran_dialer_cancel(nni_aio *aio, void *arg, int rv) +wstran_dialer_cancel(nni_aio *aio, void *arg, nng_err rv) { ws_dialer *d = arg; diff --git a/src/supplemental/http/http_client.c b/src/supplemental/http/http_client.c index 5c408718..06215ca0 100644 --- a/src/supplemental/http/http_client.c +++ b/src/supplemental/http/http_client.c @@ -175,7 +175,7 @@ nni_http_client_get( } static void -http_dial_cancel(nni_aio *aio, void *arg, int rv) +http_dial_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_http_client *c = arg; nni_mtx_lock(&c->mtx); @@ -366,7 +366,7 @@ error: } static void -http_txn_cancel(nni_aio *aio, void *arg, int rv) +http_txn_cancel(nni_aio *aio, void *arg, nng_err rv) { http_txn *txn = arg; nni_mtx_lock(&http_txn_lk); diff --git a/src/supplemental/http/http_conn.c b/src/supplemental/http/http_conn.c index 00961852..5baa3136 100644 --- a/src/supplemental/http/http_conn.c +++ b/src/supplemental/http/http_conn.c @@ -434,7 +434,7 @@ http_rd_cb(void *arg) } static void -http_rd_cancel(nni_aio *aio, void *arg, int rv) +http_rd_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_http_conn *conn = arg; @@ -549,7 +549,7 @@ done: } static void -http_wr_cancel(nni_aio *aio, void *arg, int rv) +http_wr_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_http_conn *conn = arg; diff --git a/src/supplemental/tls/tls_common.c b/src/supplemental/tls/tls_common.c index c068109d..c31e5fe9 100644 --- a/src/supplemental/tls/tls_common.c +++ b/src/supplemental/tls/tls_common.c @@ -47,7 +47,7 @@ static void tls_bio_send_start(tls_conn *); static void tls_bio_error(tls_conn *, int); static void -tls_cancel(nni_aio *aio, void *arg, int rv) +tls_cancel(nni_aio *aio, void *arg, nng_err rv) { tls_conn *conn = arg; nni_mtx_lock(&conn->lock); diff --git a/src/supplemental/tls/tls_dialer.c b/src/supplemental/tls/tls_dialer.c index d0fee0ac..7f547839 100644 --- a/src/supplemental/tls/tls_dialer.c +++ b/src/supplemental/tls/tls_dialer.c @@ -57,7 +57,7 @@ tls_dialer_stop(void *arg) // Dialer cancel is called when the user has indicated that they no longer // want to wait for the connection to establish. static void -tls_dialer_cancel(nni_aio *aio, void *arg, int rv) +tls_dialer_cancel(nni_aio *aio, void *arg, nng_err rv) { tls_stream *ts = arg; diff --git a/src/supplemental/tls/tls_listener.c b/src/supplemental/tls/tls_listener.c index 5e884165..07cdbda6 100644 --- a/src/supplemental/tls/tls_listener.c +++ b/src/supplemental/tls/tls_listener.c @@ -67,7 +67,7 @@ tls_listener_listen(void *arg) // Listener cancel is called when the user has indicated that they no longer // want to wait for the connection to establish. static void -tls_listener_cancel(nni_aio *aio, void *arg, int rv) +tls_listener_cancel(nni_aio *aio, void *arg, nng_err rv) { tls_stream *ts = arg; diff --git a/src/supplemental/websocket/websocket.c b/src/supplemental/websocket/websocket.c index 86edf123..0f5c6598 100644 --- a/src/supplemental/websocket/websocket.c +++ b/src/supplemental/websocket/websocket.c @@ -547,7 +547,7 @@ ws_start_write(nni_ws *ws) } static void -ws_cancel_close(nni_aio *aio, void *arg, int rv) +ws_cancel_close(nni_aio *aio, void *arg, nng_err rv) { nni_ws *ws = arg; nni_mtx_lock(&ws->mtx); @@ -653,7 +653,7 @@ ws_write_cb(void *arg) } static void -ws_write_cancel(nni_aio *aio, void *arg, int rv) +ws_write_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_ws *ws = arg; ws_frame *frame; @@ -1108,7 +1108,7 @@ ws_read_cb(void *arg) } static void -ws_read_cancel(nni_aio *aio, void *arg, int rv) +ws_read_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_ws *ws = arg; @@ -1607,7 +1607,7 @@ err: } static void -ws_accept_cancel(nni_aio *aio, void *arg, int rv) +ws_accept_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_ws_listener *l = arg; @@ -2203,7 +2203,7 @@ ws_dialer_free(void *arg) } static void -ws_dial_cancel(nni_aio *aio, void *arg, int rv) +ws_dial_cancel(nni_aio *aio, void *arg, nng_err rv) { nni_ws *ws = arg; |