From 79afcea91aa6882eede47b5cddc4f097454b6027 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sat, 8 Aug 2020 14:02:52 -0700 Subject: fixes #1279 Add support for ws4:// and ws6:// style websocket urls fixes #1277 FreeBSD errors due to bad v4 vs. v6 assumptions --- tests/tcp.c | 2 +- tests/udp.c | 6 +++--- tests/ws.c | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/tcp.c b/tests/tcp.c index 8975da33..1288af01 100644 --- a/tests/tcp.c +++ b/tests/tcp.c @@ -84,7 +84,7 @@ TestMain("TCP Transport", { nng_close(s2); nng_close(s1); }); - trantest_next_address(addr, "tcp://*:%u"); + trantest_next_address(addr, "tcp4://*:%u"); So(nng_listen(s1, addr, NULL, 0) == 0); // reset port back one trantest_prev_address(addr, "tcp://127.0.0.1:%u"); diff --git a/tests/udp.c b/tests/udp.c index d5f20c26..af7b2807 100644 --- a/tests/udp.c +++ b/tests/udp.c @@ -1,5 +1,5 @@ // -// Copyright 2018 Staysail Systems, Inc. +// Copyright 2020 Staysail Systems, Inc. // Copyright 2018 Capitar IT Group BV // // This software is supplied under the terms of the MIT License, a @@ -229,7 +229,7 @@ TestMain("UDP support", { nng_aio_wait(aio1); So((rv = nng_aio_result(aio1)) != 0); So(rv == NNG_EADDRINVAL || rv == NNG_ENOTSUP || - rv == NNG_EUNREACHABLE); + rv == NNG_EUNREACHABLE || rv == NNG_EINVAL); nng_aio_free(aio1); }); @@ -255,7 +255,7 @@ TestMain("UDP support", { nng_aio_wait(aio1); So((rv = nng_aio_result(aio1)) != 0); So(rv == NNG_EADDRINVAL || rv == NNG_ENOTSUP || - rv == NNG_EUNREACHABLE); + rv == NNG_EUNREACHABLE || rv == NNG_EINVAL); nng_aio_free(aio1); }); }); diff --git a/tests/ws.c b/tests/ws.c index 56564c37..4e12a788 100644 --- a/tests/ws.c +++ b/tests/ws.c @@ -1,5 +1,5 @@ // -// Copyright 2019 Staysail Systems, Inc. +// Copyright 2020 Staysail Systems, Inc. // Copyright 2018 Capitar IT Group BV // // This software is supplied under the terms of the MIT License, a @@ -95,7 +95,7 @@ TestMain("WebSocket Transport", { nng_close(s2); nng_close(s1); }); - trantest_next_address(addr, "ws://:%u/test"); + trantest_next_address(addr, "ws4://:%u/test"); So(nng_listen(s1, addr, NULL, 0) == 0); nng_msleep(100); // reset port back one @@ -114,7 +114,7 @@ TestMain("WebSocket Transport", { nng_close(s2); nng_close(s1); }); - trantest_next_address(addr, "ws://*:%u/test"); + trantest_next_address(addr, "ws4://*:%u/test"); So(nng_listen(s1, addr, NULL, 0) == 0); nng_msleep(100); // reset port back one @@ -150,8 +150,8 @@ TestMain("WebSocket Transport", { nng_close(s1); nng_close(s2); }); - So(nng_listen(s1, "ws://*:5599/one", NULL, 0) == 0); - So(nng_listen(s1, "ws://*:5599/two", NULL, 0) == 0); + So(nng_listen(s1, "ws4://*:5599/one", NULL, 0) == 0); + So(nng_listen(s1, "ws4://*:5599/two", NULL, 0) == 0); So(nng_dial(s2, "ws://127.0.0.1:5599/one", NULL, 0) == 0); }); -- cgit v1.2.3-70-g09d2