aboutsummaryrefslogtreecommitdiff
path: root/src/transport
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2020-10-31 18:47:07 -0700
committerGarrett D'Amore <garrett@damore.org>2020-10-31 23:10:12 -0700
commit452ecf5ae83adc9ae77518746f4f81171c42248c (patch)
treed81730eef3c19775abf0715831dc18e3f9885d21 /src/transport
parent587bc765ee69acfabf3bc8b88a70806c07b61f87 (diff)
downloadnng-452ecf5ae83adc9ae77518746f4f81171c42248c.tar.gz
nng-452ecf5ae83adc9ae77518746f4f81171c42248c.tar.bz2
nng-452ecf5ae83adc9ae77518746f4f81171c42248c.zip
fixes #1311 reduce wasted use for nni_aio
fixes #1317 IPv6 listener get port is incorrect fixes #1319 Want symbolic service names This is phase 1 of reducing the memory foot-print of aios, and also of pipes. This removes the largest consumer the socket address information, from the aio, which was only used by a few consumers.
Diffstat (limited to 'src/transport')
-rw-r--r--src/transport/tcp/tcp.c5
-rw-r--r--src/transport/tls/tls.c8
2 files changed, 3 insertions, 10 deletions
diff --git a/src/transport/tcp/tcp.c b/src/transport/tcp/tcp.c
index aee917e9..c240f4ef 100644
--- a/src/transport/tcp/tcp.c
+++ b/src/transport/tcp/tcp.c
@@ -728,11 +728,8 @@ tcptran_url_parse_source(nng_url *url, nng_sockaddr *sa, const nng_url *surl)
return (rv);
}
- nni_tcp_resolv(src, 0, af, 1, aio);
+ nni_resolv_ip(src, "0", af, true, sa, aio);
nni_aio_wait(aio);
- if ((rv = nni_aio_result(aio)) == 0) {
- nni_aio_get_sockaddr(aio, sa);
- }
nni_aio_free(aio);
nni_free(src, len + 1);
return (rv);
diff --git a/src/transport/tls/tls.c b/src/transport/tls/tls.c
index c291ecf7..76e182a4 100644
--- a/src/transport/tls/tls.c
+++ b/src/transport/tls/tls.c
@@ -701,11 +701,8 @@ tlstran_url_parse_source(nni_url *url, nng_sockaddr *sa, const nni_url *surl)
return (rv);
}
- nni_tcp_resolv(src, 0, af, 1, aio);
+ nni_resolv_ip(src, "0", af, 1, sa, aio);
nni_aio_wait(aio);
- if ((rv = nni_aio_result(aio)) == 0) {
- nni_aio_get_sockaddr(aio, sa);
- }
nni_aio_free(aio);
nni_free(src, len + 1);
return (rv);
@@ -939,8 +936,7 @@ tlstran_ep_init_listener(void **lp, nni_url *url, nni_listener *nlistener)
tlstran_ep_fini(ep);
return (rv);
}
- nni_aio_set_input(aio, 0, &ep->sa);
- nni_tcp_resolv(host, url->u_port, af, 1, aio);
+ nni_resolv_ip(host, url->u_port, af, true, &ep->sa, aio);
nni_aio_wait(aio);
rv = nni_aio_result(aio);
nni_aio_free(aio);