diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/options.c | 20 | ||||
| -rw-r--r-- | src/core/options.h | 2 | ||||
| -rw-r--r-- | src/nng.c | 6 | ||||
| -rw-r--r-- | src/platform/posix/posix_tcpdial.c | 3 | ||||
| -rw-r--r-- | src/platform/windows/win_tcpdial.c | 3 | ||||
| -rw-r--r-- | src/sp/transport/ipc/ipc_test.c | 7 | ||||
| -rw-r--r-- | src/sp/transport/zerotier/zerotier.c | 3 | ||||
| -rw-r--r-- | src/supplemental/websocket/websocket_test.c | 5 |
8 files changed, 14 insertions, 35 deletions
diff --git a/src/core/options.c b/src/core/options.c index 5de87c61..ff794168 100644 --- a/src/core/options.c +++ b/src/core/options.c @@ -204,26 +204,12 @@ nni_copyin_u64(uint64_t *up, const void *v, size_t sz, nni_type t) } int -nni_copyin_sockaddr(nng_sockaddr *ap, const void *v, size_t sz, nni_type t) +nni_copyin_sockaddr(nng_sockaddr *ap, const void *v, nni_type t) { - nng_sockaddr a; - - switch (t) { - case NNI_TYPE_SOCKADDR: - a = *(nng_sockaddr *) v; - break; - case NNI_TYPE_OPAQUE: - if (sz != sizeof(nng_sockaddr)) { - return (NNG_EINVAL); - } - memcpy(&a, v, sz); - break; - default: + if (t != NNI_TYPE_SOCKADDR) { return (NNG_EBADTYPE); } - if (ap != NULL) { - *ap = a; - } + *ap = *(nng_sockaddr *) v; return (0); } diff --git a/src/core/options.h b/src/core/options.h index aff429df..67481d9f 100644 --- a/src/core/options.h +++ b/src/core/options.h @@ -34,7 +34,7 @@ extern int nni_copyin_size( extern int nni_copyin_str(char *, const void *, size_t, size_t, nni_type); extern int nni_copyin_ptr(void **, const void *, size_t, nni_type); extern int nni_copyin_u64(uint64_t *, const void *, size_t, nni_type); -extern int nni_copyin_sockaddr(nng_sockaddr *, const void *, size_t, nni_type); +extern int nni_copyin_sockaddr(nng_sockaddr *, const void *, nni_type); // nni_copyout_xxx copies out a type of the named value. It assumes that // the type is aligned and the size correct, unless NNI_TYPE_OPAQUE is passed. @@ -1384,12 +1384,6 @@ pipe_get(nng_pipe p, const char *name, void *val, size_t *szp, nni_type t) } int -nng_pipe_get(nng_pipe id, const char *n, void *v, size_t *szp) -{ - return (pipe_get(id, n, v, szp, NNI_TYPE_OPAQUE)); -} - -int nng_pipe_get_int(nng_pipe id, const char *n, int *v) { return (pipe_get(id, n, v, NULL, NNI_TYPE_INT32)); diff --git a/src/platform/posix/posix_tcpdial.c b/src/platform/posix/posix_tcpdial.c index 6aea8ae5..3f0b0768 100644 --- a/src/platform/posix/posix_tcpdial.c +++ b/src/platform/posix/posix_tcpdial.c @@ -347,8 +347,9 @@ tcp_dialer_set_locaddr(void *arg, const void *buf, size_t sz, nni_type t) #ifdef NNG_ENABLE_IPV6 struct sockaddr_in6 *sin6; #endif + NNI_ARG_UNUSED(sz); - if ((rv = nni_copyin_sockaddr(&sa, buf, sz, t)) != 0) { + if ((rv = nni_copyin_sockaddr(&sa, buf, t)) != 0) { return (rv); } if ((len = nni_posix_nn2sockaddr(&ss, &sa)) == 0) { diff --git a/src/platform/windows/win_tcpdial.c b/src/platform/windows/win_tcpdial.c index dbdd0762..5492d265 100644 --- a/src/platform/windows/win_tcpdial.c +++ b/src/platform/windows/win_tcpdial.c @@ -342,8 +342,9 @@ tcp_dialer_set_locaddr(void *arg, const void *buf, size_t sz, nni_type t) #ifdef NNG_ENABLE_IPV6 struct sockaddr_in6 *sin6; #endif + NNI_ARG_UNUSED(sz); - if ((rv = nni_copyin_sockaddr(&sa, buf, sz, t)) != 0) { + if ((rv = nni_copyin_sockaddr(&sa, buf, t)) != 0) { return (rv); } if ((sslen = nni_win_nn2sockaddr(&ss, &sa)) == 0) { 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; diff --git a/src/supplemental/websocket/websocket_test.c b/src/supplemental/websocket/websocket_test.c index 1b48aff5..d784c1bc 100644 --- a/src/supplemental/websocket/websocket_test.c +++ b/src/supplemental/websocket/websocket_test.c @@ -20,7 +20,6 @@ test_websocket_wildcard(void) nng_stream_listener *l = NULL; nng_sockaddr sa1; nng_sockaddr sa2; - size_t sz; nng_aio *daio = NULL; nng_aio *laio = NULL; nng_aio *aio1 = NULL; @@ -38,9 +37,7 @@ test_websocket_wildcard(void) // Let's get the address we're going to use to dial -- also check // that it is correct. - sz = sizeof(sa1); - NUTS_PASS(nng_stream_listener_get(l, NNG_OPT_LOCADDR, &sa1, &sz)); - NUTS_TRUE(sz == sizeof(sa1)); + NUTS_PASS(nng_stream_listener_get_addr(l, NNG_OPT_LOCADDR, &sa1)); NUTS_TRUE(sa1.s_in.sa_port != 0); NUTS_TRUE(sa1.s_family == NNG_AF_INET); NUTS_TRUE(nuts_be32(sa1.s_in.sa_addr) == 0x7F000001u); |