diff options
| author | Garrett D'Amore <garrett@damore.org> | 2024-05-25 18:56:32 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2024-05-30 07:28:48 -0700 |
| commit | 762be97bd97fca47f1129fd15fc36ad03669f69f (patch) | |
| tree | d16f37788cd6af64f37c5cfe34efe4ae3ebee8f7 /src/platform/windows/win_udp.c | |
| parent | 7e119fae1b8d0e3c4e69459a02481debfc578de7 (diff) | |
| download | nng-762be97bd97fca47f1129fd15fc36ad03669f69f.tar.gz nng-762be97bd97fca47f1129fd15fc36ad03669f69f.tar.bz2 nng-762be97bd97fca47f1129fd15fc36ad03669f69f.zip | |
windows: drop the hEvent initialization for win_io structures.
We use overlapped I/O, so we don't need a separate hEvent.
Diffstat (limited to 'src/platform/windows/win_udp.c')
| -rw-r--r-- | src/platform/windows/win_udp.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/platform/windows/win_udp.c b/src/platform/windows/win_udp.c index 88f2cd5b..09064e2f 100644 --- a/src/platform/windows/win_udp.c +++ b/src/platform/windows/win_udp.c @@ -1,5 +1,5 @@ // -// Copyright 2020 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech> // Copyright 2018 Capitar IT Group BV <info@capitar.com> // // This software is supplied under the terms of the MIT License, a @@ -38,7 +38,7 @@ static void udp_recv_start(nni_plat_udp *); int nni_plat_udp_open(nni_plat_udp **udpp, nni_sockaddr *sa) { - nni_plat_udp * u; + nni_plat_udp *u; SOCKADDR_STORAGE ss; int sslen; DWORD no; @@ -67,8 +67,9 @@ nni_plat_udp_open(nni_plat_udp **udpp, nni_sockaddr *sa) (void) setsockopt( u->s, IPPROTO_IPV6, IPV6_V6ONLY, (char *) &no, sizeof(no)); - if (((rv = nni_win_io_init(&u->rxio, udp_recv_cb, u)) != 0) || - ((rv = nni_win_io_register((HANDLE) u->s)) != 0)) { + nni_win_io_init(&u->rxio, udp_recv_cb, u); + + if ((rv = nni_win_io_register((HANDLE) u->s)) != 0) { nni_plat_udp_close(u); return (rv); } @@ -102,7 +103,6 @@ nni_plat_udp_close(nni_plat_udp *u) closesocket(u->s); } - nni_win_io_fini(&u->rxio); nni_mtx_fini(&u->lk); nni_cv_fini(&u->cv); NNI_FREE_STRUCT(u); @@ -115,10 +115,10 @@ nni_plat_udp_send(nni_plat_udp *u, nni_aio *aio) { SOCKADDR_STORAGE to; int tolen; - nng_sockaddr * sa; + nng_sockaddr *sa; unsigned naiov; - nni_iov * aiov; - WSABUF * iov; + nni_iov *aiov; + WSABUF *iov; int rv; DWORD nsent; @@ -191,7 +191,7 @@ udp_recv_cb(nni_win_io *io, int rv, size_t num) { nni_plat_udp *u = io->ptr; nni_sockaddr *sa; - nni_aio * aio; + nni_aio *aio; nni_mtx_lock(&u->lk); if ((aio = nni_list_first(&u->rxq)) == NULL) { @@ -226,7 +226,7 @@ udp_recv_start(nni_plat_udp *u) DWORD flags; nni_iov *aiov; unsigned naiov; - WSABUF * iov; + WSABUF *iov; nni_aio *aio; if ((u->s == INVALID_SOCKET) || (u->closed)) { |