From 8249242a9325a27e57107d78bfa168e918cc4f7a Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sun, 3 Nov 2024 08:29:55 -0800 Subject: Remove untyped nng_pipe_get, support for untyped sockaddr set. This is a step on the path to removing unsafe untyped option accesses. --- src/sp/transport/ipc/ipc_test.c | 7 +++---- src/sp/transport/zerotier/zerotier.c | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/sp') diff --git a/src/sp/transport/ipc/ipc_test.c b/src/sp/transport/ipc/ipc_test.c index 473246fe..d6c4e3d8 100644 --- a/src/sp/transport/ipc/ipc_test.c +++ b/src/sp/transport/ipc/ipc_test.c @@ -67,8 +67,7 @@ test_ipc_dialer_properties(void) // Dialers don't have local addresses. NUTS_FAIL(nng_dialer_get_addr(d, NNG_OPT_LOCADDR, &sa), NNG_ENOTSUP); - NUTS_FAIL( - nng_dialer_set(d, NNG_OPT_LOCADDR, &sa, sizeof(sa)), NNG_ENOTSUP); + NUTS_FAIL(nng_dialer_set_addr(d, NNG_OPT_LOCADDR, &sa), NNG_ENOTSUP); z = 8192; NUTS_PASS(nng_dialer_set_size(d, NNG_OPT_RECVMAXSZ, z)); @@ -133,8 +132,8 @@ test_ipc_listener_properties(void) NUTS_TRUE(sa.s_ipc.sa_family == NNG_AF_IPC); NUTS_MATCH(sa.s_ipc.sa_path, addr + strlen("ipc://")); - NUTS_FAIL(nng_listener_set(l, NNG_OPT_LOCADDR, &sa, sizeof(sa)), - NNG_EREADONLY); + NUTS_FAIL( + nng_listener_set_addr(l, NNG_OPT_LOCADDR, &sa), NNG_EREADONLY); z = 8192; NUTS_PASS(nng_listener_set_size(l, NNG_OPT_RECVMAXSZ, z)); z = 0; diff --git a/src/sp/transport/zerotier/zerotier.c b/src/sp/transport/zerotier/zerotier.c index 295dda5d..b3e931ef 100644 --- a/src/sp/transport/zerotier/zerotier.c +++ b/src/sp/transport/zerotier/zerotier.c @@ -2745,8 +2745,9 @@ zt_ep_set_add_local_addr(void *arg, const void *data, size_t sz, nni_type t) nng_sockaddr sa; zt_ep *ep = arg; int rv; + NNI_ARG_UNUSED(sz); - if ((rv = nni_copyin_sockaddr(&sa, data, sz, t)) == 0) { + if ((rv = nni_copyin_sockaddr(&sa, data, t)) == 0) { enum ZT_ResultCode zrv; zt_node *ztn; struct sockaddr_storage ss; -- cgit v1.2.3-70-g09d2