diff options
| author | Garrett D'Amore <garrett@damore.org> | 2019-01-21 22:40:10 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2019-02-16 19:22:27 -0800 |
| commit | 5cf750697624d4fd63cfe26921209d7c30e1a2d2 (patch) | |
| tree | bf11695e5f1ec5e400c87da0cc6ff23935a2eeff /tests/resolv.c | |
| parent | ca655b9db689ee0e655248b1a9f166b8db6cc984 (diff) | |
| download | nng-5cf750697624d4fd63cfe26921209d7c30e1a2d2.tar.gz nng-5cf750697624d4fd63cfe26921209d7c30e1a2d2.tar.bz2 nng-5cf750697624d4fd63cfe26921209d7c30e1a2d2.zip | |
fixes #872 create unified nng_stream API
This is a major change, and includes changes to use a polymorphic
stream API for all transports. There have been related bugs fixed
along the way. Additionally the man pages have changed.
The old non-polymorphic APIs are removed now. This is a breaking
change, but the old APIs were never part of any released public API.
Diffstat (limited to 'tests/resolv.c')
| -rw-r--r-- | tests/resolv.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/tests/resolv.c b/tests/resolv.c index 954481b7..bcfb78a4 100644 --- a/tests/resolv.c +++ b/tests/resolv.c @@ -77,11 +77,11 @@ TestMain("Resolver", { nng_sockaddr sa; So(nng_aio_alloc(&aio, NULL, NULL) == 0); - nng_aio_set_input(aio, 0, &sa); nni_tcp_resolv("google-public-dns-a.google.com", "80", NNG_AF_INET, 1, aio); nng_aio_wait(aio); So(nng_aio_result(aio) == 0); + nni_aio_get_sockaddr(aio, &sa); So(sa.s_in.sa_family == NNG_AF_INET); So(sa.s_in.sa_port == ntohs(80)); str = ip4tostr(&sa.s_in.sa_addr); @@ -94,10 +94,10 @@ TestMain("Resolver", { nng_sockaddr sa; So(nng_aio_alloc(&aio, NULL, NULL) == 0); - nng_aio_set_input(aio, 0, &sa); nni_udp_resolv("8.8.4.4", "69", NNG_AF_INET, 1, aio); nng_aio_wait(aio); So(nng_aio_result(aio) == 0); + nni_aio_get_sockaddr(aio, &sa); So(sa.s_in.sa_family == NNG_AF_INET); So(sa.s_in.sa_port == ntohs(69)); str = ip4tostr(&sa.s_in.sa_addr); @@ -110,10 +110,10 @@ TestMain("Resolver", { nng_sockaddr sa; So(nng_aio_alloc(&aio, NULL, NULL) == 0); - nng_aio_set_input(aio, 0, &sa); nni_tcp_resolv("8.8.4.4", "80", NNG_AF_INET, 1, aio); nng_aio_wait(aio); So(nng_aio_result(aio) == 0); + nni_aio_get_sockaddr(aio, &sa); So(sa.s_in.sa_family == NNG_AF_INET); So(sa.s_in.sa_port == ntohs(80)); str = ip4tostr(&sa.s_in.sa_addr); @@ -135,10 +135,10 @@ TestMain("Resolver", { } So(nng_aio_alloc(&aio, NULL, NULL) == 0); - nng_aio_set_input(aio, 0, &sa); nni_tcp_resolv("::1", "80", NNG_AF_INET6, 1, aio); nng_aio_wait(aio); So(nng_aio_result(aio) == 0); + nni_aio_get_sockaddr(aio, &sa); So(sa.s_in6.sa_family == NNG_AF_INET6); So(sa.s_in6.sa_port == ntohs(80)); str = ip6tostr(&sa.s_in6.sa_addr); @@ -147,11 +147,9 @@ TestMain("Resolver", { }); Convey("Name service names not supported", { - nng_aio * aio; - nng_sockaddr sa; + nng_aio *aio; So(nng_aio_alloc(&aio, NULL, NULL) == 0); - nng_aio_set_input(aio, 0, &sa); nni_tcp_resolv("8.8.4.4", "http", NNG_AF_INET, 1, aio); nng_aio_wait(aio); So(nng_aio_result(aio) == NNG_EADDRINVAL); @@ -164,10 +162,10 @@ TestMain("Resolver", { nng_sockaddr sa; So(nng_aio_alloc(&aio, NULL, NULL) == 0); - nng_aio_set_input(aio, 0, &sa); nni_tcp_resolv("localhost", "80", NNG_AF_INET, 1, aio); nng_aio_wait(aio); So(nng_aio_result(aio) == 0); + nni_aio_get_sockaddr(aio, &sa); So(sa.s_in.sa_family == NNG_AF_INET); So(sa.s_in.sa_port == ntohs(80)); So(sa.s_in.sa_addr == ntohl(0x7f000001)); @@ -182,10 +180,10 @@ TestMain("Resolver", { nng_sockaddr sa; So(nng_aio_alloc(&aio, NULL, NULL) == 0); - nng_aio_set_input(aio, 0, &sa); nni_tcp_resolv("localhost", "80", NNG_AF_UNSPEC, 1, aio); nng_aio_wait(aio); So(nng_aio_result(aio) == 0); + nni_aio_get_sockaddr(aio, &sa); So((sa.s_family == NNG_AF_INET) || (sa.s_family == NNG_AF_INET6)); switch (sa.s_family) { |