diff options
| author | Garrett D'Amore <garrett@damore.org> | 2024-12-12 17:55:48 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2024-12-12 17:55:48 -0800 |
| commit | 81f5d3c6268ff91ee9c36c4cb34f6f9bfd54740d (patch) | |
| tree | f9f21aa66bd22cfd95ae0c4b8abe57036c8fce0d /src/sp/transport/ws | |
| parent | 371eedeeb6fafe628ae89b9ad2690fa3d6a57e8a (diff) | |
| download | nng-81f5d3c6268ff91ee9c36c4cb34f6f9bfd54740d.tar.gz nng-81f5d3c6268ff91ee9c36c4cb34f6f9bfd54740d.tar.bz2 nng-81f5d3c6268ff91ee9c36c4cb34f6f9bfd54740d.zip | |
streams: add explicit stop functions
This allows us to explicitly stop streams, dialers, and listeners,
before we start tearing down things. This hopefully will be useful
in resolving use-after-free bugs in http, tls, and websockets.
The new functions are not yet documented, but they are
nng_stream_stop, nng_stream_dialer_stop, and nng_stream_listener_stop.
They should be called after close, and before free. The close
functions now close without blocking, but the stop function is
allowed to block.
Diffstat (limited to 'src/sp/transport/ws')
| -rw-r--r-- | src/sp/transport/ws/websocket.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/sp/transport/ws/websocket.c b/src/sp/transport/ws/websocket.c index 27cc6434..16929ec9 100644 --- a/src/sp/transport/ws/websocket.c +++ b/src/sp/transport/ws/websocket.c @@ -183,6 +183,7 @@ wstran_pipe_stop(void *arg) nni_aio_stop(&p->rxaio); nni_aio_stop(&p->txaio); + nng_stream_stop(p->ws); } static int @@ -214,9 +215,7 @@ wstran_pipe_close(void *arg) nni_aio_close(&p->rxaio); nni_aio_close(&p->txaio); - nni_mtx_lock(&p->mtx); nng_stream_close(p->ws); - nni_mtx_unlock(&p->mtx); } static int @@ -373,6 +372,7 @@ wstran_dialer_stop(void *arg) ws_dialer *d = arg; nni_aio_stop(&d->connaio); + nng_stream_dialer_stop(d->dialer); } static void @@ -392,6 +392,7 @@ wstran_listener_stop(void *arg) ws_listener *l = arg; nni_aio_stop(&l->accaio); + nng_stream_listener_stop(l->listener); } static void @@ -421,6 +422,7 @@ wstran_connect_cb(void *arg) } if ((uaio = nni_list_first(&d->aios)) == NULL) { // The client stopped caring about this! + nng_stream_stop(ws); nng_stream_free(ws); nni_mtx_unlock(&d->mtx); return; @@ -430,6 +432,7 @@ wstran_connect_cb(void *arg) if ((rv = nni_aio_result(caio)) != 0) { nni_aio_finish_error(uaio, rv); } else if ((rv = wstran_pipe_alloc(&p, ws)) != 0) { + nng_stream_stop(ws); nng_stream_free(ws); nni_aio_finish_error(uaio, rv); } else { |