diff options
| author | Garrett D'Amore <garrett@damore.org> | 2018-10-25 22:05:53 -0400 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2018-10-25 22:05:53 -0400 |
| commit | ffc1e7405171ddbc6d2781ef71f86f709624450c (patch) | |
| tree | 8835bb0d9e5fc5a5525a7519f46908648a581f5f | |
| parent | 5c2973001e20132bb47dbd23a1c5e815c56e8cfb (diff) | |
| download | nng-ffc1e7405171ddbc6d2781ef71f86f709624450c.tar.gz nng-ffc1e7405171ddbc6d2781ef71f86f709624450c.tar.bz2 nng-ffc1e7405171ddbc6d2781ef71f86f709624450c.zip | |
Clean up some zerotier compiler warnings.
| -rw-r--r-- | src/transport/zerotier/zerotier.c | 3 | ||||
| -rw-r--r-- | tests/zt.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/transport/zerotier/zerotier.c b/src/transport/zerotier/zerotier.c index 030d1d82..294d1df4 100644 --- a/src/transport/zerotier/zerotier.c +++ b/src/transport/zerotier/zerotier.c @@ -1300,7 +1300,6 @@ zt_wire_packet_send(ZT_Node *node, void *userptr, void *thr, int64_t socket, struct sockaddr_in6 *sin6 = (void *) remaddr; zt_node * ztn = userptr; nni_plat_udp * udp; - uint16_t port; uint8_t * buf; zt_send_hdr * hdr; nni_iov iov; @@ -1319,13 +1318,11 @@ zt_wire_packet_send(ZT_Node *node, void *userptr, void *thr, int64_t socket, addr.s_in.sa_port = sin->sin_port; addr.s_in.sa_addr = sin->sin_addr.s_addr; udp = ztn->zn_udp4; - port = htons(sin->sin_port); break; case AF_INET6: addr.s_in6.sa_family = NNG_AF_INET6; addr.s_in6.sa_port = sin6->sin6_port; udp = ztn->zn_udp6; - port = htons(sin6->sin6_port); memcpy(addr.s_in6.sa_addr, sin6->sin6_addr.s6_addr, 16); break; default: @@ -287,7 +287,8 @@ TestMain("ZeroTier Transport", { So(nng_listener_create(&l_test, s_test, "zt://*." NWID ":0") == 0); So(nng_listener_start(l_test, 0) == 0); So(nng_listener_getopt_uint64(l_test, NNG_OPT_ZT_NODE, &node) == 0); - snprintf(fmt, sizeof(fmt), "zt://%llx." NWID ":%%u", node); + snprintf(fmt, sizeof(fmt), "zt://%llx." NWID ":%%u", + (unsigned long long) node); nng_listener_close(l_test); trantest_test_extended(fmt, check_props); |