diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test-io-channel-socket.c | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/tests/test-io-channel-socket.c b/tests/test-io-channel-socket.c index c5c1314..a66ffc2 100644 --- a/tests/test-io-channel-socket.c +++ b/tests/test-io-channel-socket.c @@ -115,8 +115,8 @@ static void test_io_channel_set_socket_bufs(QIOChannel *src, } -static void test_io_channel_setup_sync(SocketAddress *listen_addr, - SocketAddress *connect_addr, +static void test_io_channel_setup_sync(SocketAddressLegacy *listen_addr, + SocketAddressLegacy *connect_addr, QIOChannel **src, QIOChannel **dst) { @@ -125,14 +125,14 @@ static void test_io_channel_setup_sync(SocketAddress *listen_addr, lioc = qio_channel_socket_new(); qio_channel_socket_listen_sync(lioc, listen_addr, &error_abort); - if (listen_addr->type == SOCKET_ADDRESS_KIND_INET) { - SocketAddress *laddr = qio_channel_socket_get_local_address( + if (listen_addr->type == SOCKET_ADDRESS_LEGACY_KIND_INET) { + SocketAddressLegacy *laddr = qio_channel_socket_get_local_address( lioc, &error_abort); g_free(connect_addr->u.inet.data->port); connect_addr->u.inet.data->port = g_strdup(laddr->u.inet.data->port); - qapi_free_SocketAddress(laddr); + qapi_free_SocketAddressLegacy(laddr); } *src = QIO_CHANNEL(qio_channel_socket_new()); @@ -165,8 +165,8 @@ static void test_io_channel_complete(QIOTask *task, } -static void test_io_channel_setup_async(SocketAddress *listen_addr, - SocketAddress *connect_addr, +static void test_io_channel_setup_async(SocketAddressLegacy *listen_addr, + SocketAddressLegacy *connect_addr, QIOChannel **src, QIOChannel **dst) { @@ -186,14 +186,14 @@ static void test_io_channel_setup_async(SocketAddress *listen_addr, g_assert(!data.err); - if (listen_addr->type == SOCKET_ADDRESS_KIND_INET) { - SocketAddress *laddr = qio_channel_socket_get_local_address( + if (listen_addr->type == SOCKET_ADDRESS_LEGACY_KIND_INET) { + SocketAddressLegacy *laddr = qio_channel_socket_get_local_address( lioc, &error_abort); g_free(connect_addr->u.inet.data->port); connect_addr->u.inet.data->port = g_strdup(laddr->u.inet.data->port); - qapi_free_SocketAddress(laddr); + qapi_free_SocketAddressLegacy(laddr); } *src = QIO_CHANNEL(qio_channel_socket_new()); @@ -221,8 +221,8 @@ static void test_io_channel_setup_async(SocketAddress *listen_addr, static void test_io_channel(bool async, - SocketAddress *listen_addr, - SocketAddress *connect_addr, + SocketAddressLegacy *listen_addr, + SocketAddressLegacy *connect_addr, bool passFD) { QIOChannel *src, *dst; @@ -297,17 +297,17 @@ static void test_io_channel(bool async, static void test_io_channel_ipv4(bool async) { - SocketAddress *listen_addr = g_new0(SocketAddress, 1); - SocketAddress *connect_addr = g_new0(SocketAddress, 1); + SocketAddressLegacy *listen_addr = g_new0(SocketAddressLegacy, 1); + SocketAddressLegacy *connect_addr = g_new0(SocketAddressLegacy, 1); - listen_addr->type = SOCKET_ADDRESS_KIND_INET; + listen_addr->type = SOCKET_ADDRESS_LEGACY_KIND_INET; listen_addr->u.inet.data = g_new(InetSocketAddress, 1); *listen_addr->u.inet.data = (InetSocketAddress) { .host = g_strdup("127.0.0.1"), .port = NULL, /* Auto-select */ }; - connect_addr->type = SOCKET_ADDRESS_KIND_INET; + connect_addr->type = SOCKET_ADDRESS_LEGACY_KIND_INET; connect_addr->u.inet.data = g_new(InetSocketAddress, 1); *connect_addr->u.inet.data = (InetSocketAddress) { .host = g_strdup("127.0.0.1"), @@ -316,8 +316,8 @@ static void test_io_channel_ipv4(bool async) test_io_channel(async, listen_addr, connect_addr, false); - qapi_free_SocketAddress(listen_addr); - qapi_free_SocketAddress(connect_addr); + qapi_free_SocketAddressLegacy(listen_addr); + qapi_free_SocketAddressLegacy(connect_addr); } @@ -335,17 +335,17 @@ static void test_io_channel_ipv4_async(void) static void test_io_channel_ipv6(bool async) { - SocketAddress *listen_addr = g_new0(SocketAddress, 1); - SocketAddress *connect_addr = g_new0(SocketAddress, 1); + SocketAddressLegacy *listen_addr = g_new0(SocketAddressLegacy, 1); + SocketAddressLegacy *connect_addr = g_new0(SocketAddressLegacy, 1); - listen_addr->type = SOCKET_ADDRESS_KIND_INET; + listen_addr->type = SOCKET_ADDRESS_LEGACY_KIND_INET; listen_addr->u.inet.data = g_new(InetSocketAddress, 1); *listen_addr->u.inet.data = (InetSocketAddress) { .host = g_strdup("::1"), .port = NULL, /* Auto-select */ }; - connect_addr->type = SOCKET_ADDRESS_KIND_INET; + connect_addr->type = SOCKET_ADDRESS_LEGACY_KIND_INET; connect_addr->u.inet.data = g_new(InetSocketAddress, 1); *connect_addr->u.inet.data = (InetSocketAddress) { .host = g_strdup("::1"), @@ -354,8 +354,8 @@ static void test_io_channel_ipv6(bool async) test_io_channel(async, listen_addr, connect_addr, false); - qapi_free_SocketAddress(listen_addr); - qapi_free_SocketAddress(connect_addr); + qapi_free_SocketAddressLegacy(listen_addr); + qapi_free_SocketAddressLegacy(connect_addr); } @@ -374,22 +374,22 @@ static void test_io_channel_ipv6_async(void) #ifndef _WIN32 static void test_io_channel_unix(bool async) { - SocketAddress *listen_addr = g_new0(SocketAddress, 1); - SocketAddress *connect_addr = g_new0(SocketAddress, 1); + SocketAddressLegacy *listen_addr = g_new0(SocketAddressLegacy, 1); + SocketAddressLegacy *connect_addr = g_new0(SocketAddressLegacy, 1); #define TEST_SOCKET "test-io-channel-socket.sock" - listen_addr->type = SOCKET_ADDRESS_KIND_UNIX; + listen_addr->type = SOCKET_ADDRESS_LEGACY_KIND_UNIX; listen_addr->u.q_unix.data = g_new0(UnixSocketAddress, 1); listen_addr->u.q_unix.data->path = g_strdup(TEST_SOCKET); - connect_addr->type = SOCKET_ADDRESS_KIND_UNIX; + connect_addr->type = SOCKET_ADDRESS_LEGACY_KIND_UNIX; connect_addr->u.q_unix.data = g_new0(UnixSocketAddress, 1); connect_addr->u.q_unix.data->path = g_strdup(TEST_SOCKET); test_io_channel(async, listen_addr, connect_addr, true); - qapi_free_SocketAddress(listen_addr); - qapi_free_SocketAddress(connect_addr); + qapi_free_SocketAddressLegacy(listen_addr); + qapi_free_SocketAddressLegacy(connect_addr); g_assert(g_file_test(TEST_SOCKET, G_FILE_TEST_EXISTS) == FALSE); } @@ -407,8 +407,8 @@ static void test_io_channel_unix_async(void) static void test_io_channel_unix_fd_pass(void) { - SocketAddress *listen_addr = g_new0(SocketAddress, 1); - SocketAddress *connect_addr = g_new0(SocketAddress, 1); + SocketAddressLegacy *listen_addr = g_new0(SocketAddressLegacy, 1); + SocketAddressLegacy *connect_addr = g_new0(SocketAddressLegacy, 1); QIOChannel *src, *dst; int testfd; int fdsend[3]; @@ -427,11 +427,11 @@ static void test_io_channel_unix_fd_pass(void) fdsend[1] = testfd; fdsend[2] = testfd; - listen_addr->type = SOCKET_ADDRESS_KIND_UNIX; + listen_addr->type = SOCKET_ADDRESS_LEGACY_KIND_UNIX; listen_addr->u.q_unix.data = g_new0(UnixSocketAddress, 1); listen_addr->u.q_unix.data->path = g_strdup(TEST_SOCKET); - connect_addr->type = SOCKET_ADDRESS_KIND_UNIX; + connect_addr->type = SOCKET_ADDRESS_LEGACY_KIND_UNIX; connect_addr->u.q_unix.data = g_new0(UnixSocketAddress, 1); connect_addr->u.q_unix.data->path = g_strdup(TEST_SOCKET); @@ -488,8 +488,8 @@ static void test_io_channel_unix_fd_pass(void) object_unref(OBJECT(src)); object_unref(OBJECT(dst)); - qapi_free_SocketAddress(listen_addr); - qapi_free_SocketAddress(connect_addr); + qapi_free_SocketAddressLegacy(listen_addr); + qapi_free_SocketAddressLegacy(connect_addr); unlink(TEST_SOCKET); unlink(TEST_FILE); close(testfd); |