aboutsummaryrefslogtreecommitdiff
path: root/src/supplemental/websocket/websocket.c
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2020-11-10 01:00:30 -0800
committerGarrett D'Amore <garrett@damore.org>2020-11-10 01:00:30 -0800
commite10f53cbaf9011e77044822080db134e1bd8a0fd (patch)
treeb27ffa0f4c4b6686002429c7766eb260b16409b7 /src/supplemental/websocket/websocket.c
parent34b363ce101ddc03c74fb1f002e587d2315420c3 (diff)
downloadnng-e10f53cbaf9011e77044822080db134e1bd8a0fd.tar.gz
nng-e10f53cbaf9011e77044822080db134e1bd8a0fd.tar.bz2
nng-e10f53cbaf9011e77044822080db134e1bd8a0fd.zip
fixes #1337 nni aio user data could be removed
Diffstat (limited to 'src/supplemental/websocket/websocket.c')
-rw-r--r--src/supplemental/websocket/websocket.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/supplemental/websocket/websocket.c b/src/supplemental/websocket/websocket.c
index 1cc03b45..e65fc24f 100644
--- a/src/supplemental/websocket/websocket.c
+++ b/src/supplemental/websocket/websocket.c
@@ -1260,8 +1260,7 @@ ws_reap(nni_ws *ws)
static void
ws_http_cb_listener(nni_ws *ws, nni_aio *aio)
{
- nni_ws_listener *l;
- l = nni_aio_get_data(aio, 0);
+ nni_ws_listener *l = ws->listener;
nni_mtx_lock(&l->mtx);
nni_list_remove(&l->reply, ws);
@@ -1646,9 +1645,9 @@ ws_handler(nni_aio *aio)
ws->isstream = l->isstream;
ws->recv_text = l->recv_text;
ws->send_text = l->send_text;
+ ws->listener = l;
nni_list_append(&l->reply, ws);
- nni_aio_set_data(ws->httpaio, 0, l);
nni_http_write_res(conn, res, ws->httpaio);
(void) nni_http_hijack(conn);
nni_aio_set_output(aio, 0, NULL);