diff options
| author | Garrett D'Amore <garrett@damore.org> | 2025-10-25 23:02:17 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2025-10-25 23:02:17 -0700 |
| commit | f9ff44ce0f0c73f05c182bb07c76bf6b51470560 (patch) | |
| tree | bc37e151ab8527ca6df85ccb079c2b03673ba319 /src/supplemental/websocket | |
| parent | c2aa8c12e705ba77f3d2d28c5ba0a9ec7efb7632 (diff) | |
| download | nng-f9ff44ce0f0c73f05c182bb07c76bf6b51470560.tar.gz nng-f9ff44ce0f0c73f05c182bb07c76bf6b51470560.tar.bz2 nng-f9ff44ce0f0c73f05c182bb07c76bf6b51470560.zip | |
Plumb sockaddrs all the way through pipes, make them failsafe.
These functions can no longer fail.
Diffstat (limited to 'src/supplemental/websocket')
| -rw-r--r-- | src/supplemental/websocket/websocket.c | 16 | ||||
| -rw-r--r-- | src/supplemental/websocket/websocket_test.c | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/supplemental/websocket/websocket.c b/src/supplemental/websocket/websocket.c index 2ff126e3..82cac05e 100644 --- a/src/supplemental/websocket/websocket.c +++ b/src/supplemental/websocket/websocket.c @@ -193,8 +193,8 @@ static void ws_str_send(void *, nng_aio *); static void ws_str_recv(void *, nng_aio *); static nng_err ws_str_get(void *, const char *, void *, size_t *, nni_type); static nng_err ws_str_peer_cert(void *, nng_tls_cert **); -static nng_err ws_str_self_addr(void *, const nng_sockaddr **); -static nng_err ws_str_peer_addr(void *, const nng_sockaddr **); +static const nng_sockaddr *ws_str_self_addr(void *); +static const nng_sockaddr *ws_str_peer_addr(void *); static void ws_listener_close(void *); static void ws_listener_free(void *); @@ -2846,16 +2846,16 @@ ws_str_peer_cert(void *arg, nng_tls_cert **certp) return (nni_http_conn_peer_cert(ws->http, certp)); } -static nng_err -ws_str_peer_addr(void *arg, const nng_sockaddr **sap) +static const nng_sockaddr * +ws_str_peer_addr(void *arg) { nni_ws *ws = arg; - return (nni_http_peer_addr(ws->http, sap)); + return (nni_http_peer_addr(ws->http)); } -static nng_err -ws_str_self_addr(void *arg, const nng_sockaddr **sap) +static const nng_sockaddr * +ws_str_self_addr(void *arg) { nni_ws *ws = arg; - return (nni_http_self_addr(ws->http, sap)); + return (nni_http_self_addr(ws->http)); } diff --git a/src/supplemental/websocket/websocket_test.c b/src/supplemental/websocket/websocket_test.c index 66c9617e..ffce8019 100644 --- a/src/supplemental/websocket/websocket_test.c +++ b/src/supplemental/websocket/websocket_test.c @@ -184,8 +184,8 @@ test_websocket_conn_props(void) NUTS_TRUE(c2 != NULL); // Let's compare the peer addresses - NUTS_PASS(nng_stream_self_addr(c1, &sap1)); - NUTS_PASS(nng_stream_peer_addr(c2, &sap2)); + sap1 = nng_stream_self_addr(c1); + sap2 = nng_stream_peer_addr(c2); NUTS_PASS(nng_stream_get_addr(c1, NNG_OPT_LOCADDR, &sa1)); NUTS_PASS(nng_stream_get_addr(c2, NNG_OPT_REMADDR, &sa2)); NUTS_TRUE(sa1.s_family == sa2.s_family); |