diff options
| author | Garrett D'Amore <garrett@damore.org> | 2025-01-17 05:49:14 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2025-01-17 05:50:04 -0800 |
| commit | 6d74a90b72c80edbd58d8b2b29105e749bdfc28e (patch) | |
| tree | ea2a2fcabc3ef81ac0859ecef1ab9c7f4ab88f2b /src/supplemental/websocket/websocket.c | |
| parent | 98b0d432dfeaa811cdfe20adb60ea899d61947b9 (diff) | |
| download | nng-6d74a90b72c80edbd58d8b2b29105e749bdfc28e.tar.gz nng-6d74a90b72c80edbd58d8b2b29105e749bdfc28e.tar.bz2 nng-6d74a90b72c80edbd58d8b2b29105e749bdfc28e.zip | |
http: handler API clean ups
Diffstat (limited to 'src/supplemental/websocket/websocket.c')
| -rw-r--r-- | src/supplemental/websocket/websocket.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/supplemental/websocket/websocket.c b/src/supplemental/websocket/websocket.c index 86edf123..08b3a071 100644 --- a/src/supplemental/websocket/websocket.c +++ b/src/supplemental/websocket/websocket.c @@ -102,7 +102,7 @@ struct nni_ws_listener { bool isstream; bool send_text; bool recv_text; - nni_http_handler *handler; + nng_http_handler *handler; nni_ws_listen_hook hookfn; void *hookarg; nni_list headers; // response headers @@ -1403,9 +1403,8 @@ ws_init(nni_ws **wsp) static void ws_listener_stop(void *arg) { - nni_ws_listener *l = arg; - nni_http_handler *h; - nni_http_server *s; + nni_ws_listener *l = arg; + nni_http_server *s; ws_listener_close(l); @@ -1413,15 +1412,10 @@ ws_listener_stop(void *arg) while (!nni_list_empty(&l->reply)) { nni_cv_wait(&l->cv); } - h = l->handler; - s = l->server; - l->handler = NULL; - l->server = NULL; + s = l->server; + l->server = NULL; nni_mtx_unlock(&l->mtx); - if (h != NULL) { - nni_http_handler_fini(h); - } if (s != NULL) { nni_http_server_fini(s); } @@ -2026,7 +2020,7 @@ nni_ws_listener_alloc(nng_stream_listener **wslp, const nng_url *url) if (strlen(host) == 0) { host = NULL; } - rv = nni_http_handler_init(&l->handler, url->u_path, ws_handler); + rv = nng_http_handler_alloc(&l->handler, url->u_path, ws_handler); if (rv != 0) { ws_listener_free(l); return (rv); |