diff options
| author | Garrett D'Amore <garrett@damore.org> | 2025-10-26 10:54:58 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2025-10-27 07:13:40 -0700 |
| commit | be13c2e8845423cec17af429fc4e16a5d9749e47 (patch) | |
| tree | 82614e403a41aac6581a9a223ef9eba5be557222 /src/sp/transport/socket | |
| parent | 11c53f3d7f747d14fd69ce98c63d629bc821ef68 (diff) | |
| download | nng-be13c2e8845423cec17af429fc4e16a5d9749e47.tar.gz nng-be13c2e8845423cec17af429fc4e16a5d9749e47.tar.bz2 nng-be13c2e8845423cec17af429fc4e16a5d9749e47.zip | |
Replace nng_pipe_get_addr, nng_stream_get_addr, and the NNG_OPT_REMADDR option.
More direct access methods are provided instead.
This results in much lower friction when using, and is a step on the path
to removing NNG_OPT_LOCADDR as well.
We need to figure a solution for NNG_OPT_LOCADDR for dialers; for
listeners there is little use in it either, and it will be removed.
(Dialers will probably get a new NNG_OPT_BIND_IP option.)
Diffstat (limited to 'src/sp/transport/socket')
| -rw-r--r-- | src/sp/transport/socket/sockfd_test.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/sp/transport/socket/sockfd_test.c b/src/sp/transport/socket/sockfd_test.c index ccd67587..56b77c83 100644 --- a/src/sp/transport/socket/sockfd_test.c +++ b/src/sp/transport/socket/sockfd_test.c @@ -350,7 +350,7 @@ test_sockfd_close_peer(void) } void -test_sockfd_listener_sockaddr(void) +test_sockfd_listener_no_port(void) { #ifdef NNG_HAVE_SOCKETPAIR // this test verifies that closing a socket peer @@ -358,14 +358,14 @@ test_sockfd_listener_sockaddr(void) int fds[2]; nng_socket s0; nng_listener l; - nng_sockaddr sa; + int port; NUTS_PASS(nng_socket_pair(fds)); NUTS_OPEN(s0); NUTS_PASS(nng_listen(s0, "socket://", &l, 0)); NUTS_PASS(nng_listener_set_int(l, NNG_OPT_SOCKET_FD, fds[0])); - NUTS_PASS(nng_listener_get_addr(l, NNG_OPT_LOCADDR, &sa)); - NUTS_ASSERT(sa.s_family == NNG_AF_UNSPEC); + NUTS_FAIL( + nng_listener_get_int(l, NNG_OPT_BOUND_PORT, &port), NNG_ENOTSUP); close(fds[1]); NUTS_CLOSE(s0); #else @@ -401,9 +401,9 @@ test_sockfd_pipe_sockaddr(void) NUTS_SEND(s0, "something"); NUTS_PASS(nng_recvmsg(s1, &msg, 0)); p = nng_msg_get_pipe(msg); - NUTS_PASS(nng_pipe_get_addr(p, NNG_OPT_LOCADDR, &sa)); + NUTS_PASS(nng_pipe_self_addr(p, &sa)); NUTS_ASSERT(sa.s_family == NNG_AF_UNSPEC); - NUTS_PASS(nng_pipe_get_addr(p, NNG_OPT_REMADDR, &sa)); + NUTS_PASS(nng_pipe_peer_addr(p, &sa)); NUTS_ASSERT(sa.s_family == NNG_AF_UNSPEC); NUTS_CLOSE(s0); NUTS_CLOSE(s1); @@ -574,7 +574,7 @@ NUTS_TESTS = { { "socket exchange large", test_sfd_large }, { "socket close pending", test_sockfd_close_pending }, { "socket close peer", test_sockfd_close_peer }, - { "socket listener address", test_sockfd_listener_sockaddr }, + { "socket listener no port", test_sockfd_listener_no_port }, { "socket pipe address", test_sockfd_pipe_sockaddr }, { "socket pipe peer id", test_sockfd_pipe_peer }, { "socket listen full", test_sfd_listen_full }, |