diff options
| author | Garrett D'Amore <garrett@damore.org> | 2018-03-14 15:40:46 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2018-03-14 17:16:39 -0700 |
| commit | 85ccb0066a86a3558ae81cd357463f8dc631f94b (patch) | |
| tree | 15838902439f6ed188ffb70fe2170605f26894bc /tests/resolv.c | |
| parent | f4de6b5302df8befbd2b229b701d0bf9ca81a5fb (diff) | |
| download | nng-85ccb0066a86a3558ae81cd357463f8dc631f94b.tar.gz nng-85ccb0066a86a3558ae81cd357463f8dc631f94b.tar.bz2 nng-85ccb0066a86a3558ae81cd357463f8dc631f94b.zip | |
fixes #289 nng_sockaddr could just be a union
fixes #290 sockaddr improvements
Diffstat (limited to 'tests/resolv.c')
| -rw-r--r-- | tests/resolv.c | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/tests/resolv.c b/tests/resolv.c index 9d83e6df..dfc599c0 100644 --- a/tests/resolv.c +++ b/tests/resolv.c @@ -61,9 +61,9 @@ ip6tostr(void *addr) aio); nng_aio_wait(aio); So(nng_aio_result(aio) == 0); - So(sa.s_un.s_in6.sa_family == NNG_AF_INET6); - So(sa.s_un.s_in6.sa_port == ntohs(80)); - str = ip6tostr(&sa.s_un.s_in6.sa_addr); + So(sa.s_in6.sa_family == NNG_AF_INET6); + So(sa.s_in6.sa_port == ntohs(80)); + str = ip6tostr(&sa.s_in6.sa_addr); So(strcmp(str, "::1") == 0); nng_aio_free(aio); } @@ -83,9 +83,9 @@ TestMain("Resolver", { NNG_AF_INET, 1, aio); nng_aio_wait(aio); So(nng_aio_result(aio) == 0); - So(sa.s_un.s_in.sa_family == NNG_AF_INET); - So(sa.s_un.s_in.sa_port == ntohs(80)); - str = ip4tostr(&sa.s_un.s_in.sa_addr); + So(sa.s_in.sa_family == NNG_AF_INET); + So(sa.s_in.sa_port == ntohs(80)); + str = ip4tostr(&sa.s_in.sa_addr); So(strcmp(str, "8.8.8.8") == 0); nng_aio_free(aio); }); @@ -99,9 +99,9 @@ TestMain("Resolver", { nni_plat_udp_resolv("8.8.4.4", "69", NNG_AF_INET, 1, aio); nng_aio_wait(aio); So(nng_aio_result(aio) == 0); - So(sa.s_un.s_in.sa_family == NNG_AF_INET); - So(sa.s_un.s_in.sa_port == ntohs(69)); - str = ip4tostr(&sa.s_un.s_in.sa_addr); + So(sa.s_in.sa_family == NNG_AF_INET); + So(sa.s_in.sa_port == ntohs(69)); + str = ip4tostr(&sa.s_in.sa_addr); So(strcmp(str, "8.8.4.4") == 0); nng_aio_free(aio); }); @@ -115,9 +115,9 @@ TestMain("Resolver", { nni_plat_tcp_resolv("8.8.4.4", "80", NNG_AF_INET, 1, aio); nng_aio_wait(aio); So(nng_aio_result(aio) == 0); - So(sa.s_un.s_in.sa_family == NNG_AF_INET); - So(sa.s_un.s_in.sa_port == ntohs(80)); - str = ip4tostr(&sa.s_un.s_in.sa_addr); + So(sa.s_in.sa_family == NNG_AF_INET); + So(sa.s_in.sa_port == ntohs(80)); + str = ip4tostr(&sa.s_in.sa_addr); So(strcmp(str, "8.8.4.4") == 0); nng_aio_free(aio); }); @@ -140,9 +140,9 @@ TestMain("Resolver", { nni_plat_tcp_resolv("::1", "80", NNG_AF_INET6, 1, aio); nng_aio_wait(aio); So(nng_aio_result(aio) == 0); - So(sa.s_un.s_in6.sa_family == NNG_AF_INET6); - So(sa.s_un.s_in6.sa_port == ntohs(80)); - str = ip6tostr(&sa.s_un.s_in6.sa_addr); + So(sa.s_in6.sa_family == NNG_AF_INET6); + So(sa.s_in6.sa_port == ntohs(80)); + str = ip6tostr(&sa.s_in6.sa_addr); So(strcmp(str, "::1") == 0); nng_aio_free(aio); }); @@ -157,9 +157,9 @@ TestMain("Resolver", { nni_plat_tcp_resolv("8.8.4.4", "http", NNG_AF_INET, 1, aio); nng_aio_wait(aio); So(nng_aio_result(aio) == 0); - So(sa.s_un.s_in.sa_family == NNG_AF_INET); - So(sa.s_un.s_in.sa_port == ntohs(80)); - str = ip4tostr(&sa.s_un.s_in.sa_addr); + So(sa.s_in.sa_family == NNG_AF_INET); + So(sa.s_in.sa_port == ntohs(80)); + str = ip4tostr(&sa.s_in.sa_addr); So(strcmp(str, "8.8.4.4") == 0); nng_aio_free(aio); }); @@ -174,9 +174,9 @@ TestMain("Resolver", { nni_plat_udp_resolv("8.8.4.4", "tftp", NNG_AF_INET, 1, aio); nng_aio_wait(aio); So(nng_aio_result(aio) == 0); - So(sa.s_un.s_in.sa_family == NNG_AF_INET); - So(sa.s_un.s_in.sa_port == ntohs(69)); - str = ip4tostr(&sa.s_un.s_in.sa_addr); + So(sa.s_in.sa_family == NNG_AF_INET); + So(sa.s_in.sa_port == ntohs(69)); + str = ip4tostr(&sa.s_in.sa_addr); So(strcmp(str, "8.8.4.4") == 0); nng_aio_free(aio); }); @@ -191,10 +191,10 @@ TestMain("Resolver", { nni_plat_tcp_resolv("localhost", "80", NNG_AF_INET, 1, aio); nng_aio_wait(aio); So(nng_aio_result(aio) == 0); - So(sa.s_un.s_in.sa_family == NNG_AF_INET); - So(sa.s_un.s_in.sa_port == ntohs(80)); - So(sa.s_un.s_in.sa_addr == ntohl(0x7f000001)); - str = ip4tostr(&sa.s_un.s_in.sa_addr); + 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)); + str = ip4tostr(&sa.s_in.sa_addr); So(strcmp(str, "127.0.0.1") == 0); nng_aio_free(aio); }); @@ -209,18 +209,18 @@ TestMain("Resolver", { nni_plat_tcp_resolv("localhost", "80", NNG_AF_UNSPEC, 1, aio); nng_aio_wait(aio); So(nng_aio_result(aio) == 0); - So((sa.s_un.s_family == NNG_AF_INET) || - (sa.s_un.s_family == NNG_AF_INET6)); - switch (sa.s_un.s_family) { + So((sa.s_family == NNG_AF_INET) || + (sa.s_family == NNG_AF_INET6)); + switch (sa.s_family) { case NNG_AF_INET: - So(sa.s_un.s_in.sa_port == ntohs(80)); - So(sa.s_un.s_in.sa_addr == ntohl(0x7f000001)); - str = ip4tostr(&sa.s_un.s_in.sa_addr); + So(sa.s_in.sa_port == ntohs(80)); + So(sa.s_in.sa_addr == ntohl(0x7f000001)); + str = ip4tostr(&sa.s_in.sa_addr); So(strcmp(str, "127.0.0.1") == 0); break; case NNG_AF_INET6: - So(sa.s_un.s_in6.sa_port == ntohs(80)); - str = ip6tostr(&sa.s_un.s_in6.sa_addr); + So(sa.s_in6.sa_port == ntohs(80)); + str = ip6tostr(&sa.s_in6.sa_addr); So(strcmp(str, "::1") == 0); break; } |