diff options
Diffstat (limited to 'deps/uv/test/test-udp-ipv6.c')
-rw-r--r-- | deps/uv/test/test-udp-ipv6.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/deps/uv/test/test-udp-ipv6.c b/deps/uv/test/test-udp-ipv6.c index 247fe8bf95..f545f81b1f 100644 --- a/deps/uv/test/test-udp-ipv6.c +++ b/deps/uv/test/test-udp-ipv6.c @@ -44,10 +44,13 @@ static int recv_cb_called; static int close_cb_called; -static uv_buf_t alloc_cb(uv_handle_t* handle, size_t suggested_size) { +static void alloc_cb(uv_handle_t* handle, + size_t suggested_size, + uv_buf_t* buf) { static char slab[65536]; CHECK_HANDLE(handle); - return uv_buf_init(slab, sizeof slab); + buf->base = slab; + buf->len = sizeof(slab); } @@ -67,8 +70,8 @@ static void send_cb(uv_udp_send_t* req, int status) { static void ipv6_recv_fail(uv_udp_t* handle, ssize_t nread, - uv_buf_t buf, - struct sockaddr* addr, + const uv_buf_t* buf, + const struct sockaddr* addr, unsigned flags) { ASSERT(0 && "this function should not have been called"); } @@ -76,8 +79,8 @@ static void ipv6_recv_fail(uv_udp_t* handle, static void ipv6_recv_ok(uv_udp_t* handle, ssize_t nread, - uv_buf_t buf, - struct sockaddr* addr, + const uv_buf_t* buf, + const struct sockaddr* addr, unsigned flags) { CHECK_HANDLE(handle); ASSERT(nread >= 0); @@ -100,12 +103,12 @@ static void do_test(uv_udp_recv_cb recv_cb, int bind_flags) { uv_buf_t buf; int r; - addr6 = uv_ip6_addr("::0", TEST_PORT); + ASSERT(0 == uv_ip6_addr("::0", TEST_PORT, &addr6)); r = uv_udp_init(uv_default_loop(), &server); ASSERT(r == 0); - r = uv_udp_bind6(&server, addr6, bind_flags); + r = uv_udp_bind6(&server, &addr6, bind_flags); ASSERT(r == 0); r = uv_udp_recv_start(&server, alloc_cb, recv_cb); @@ -115,9 +118,9 @@ static void do_test(uv_udp_recv_cb recv_cb, int bind_flags) { ASSERT(r == 0); buf = uv_buf_init("PING", 4); - addr = uv_ip4_addr("127.0.0.1", TEST_PORT); + ASSERT(0 == uv_ip4_addr("127.0.0.1", TEST_PORT, &addr)); - r = uv_udp_send(&req_, &client, &buf, 1, addr, send_cb); + r = uv_udp_send(&req_, &client, &buf, 1, &addr, send_cb); ASSERT(r == 0); r = uv_timer_init(uv_default_loop(), &timeout); |