diff options
| -rw-r--r-- | io/channel-socket.c | 10 | ||||
| -rw-r--r-- | tests/test-io-channel-socket.c | 29 |
2 files changed, 33 insertions, 6 deletions
diff --git a/io/channel-socket.c b/io/channel-socket.c index 90b3c73358..eed2ff5bcf 100644 --- a/io/channel-socket.c +++ b/io/channel-socket.c @@ -352,13 +352,19 @@ qio_channel_socket_accept(QIOChannelSocket *ioc, goto error; } - if (getsockname(cioc->fd, (struct sockaddr *)&ioc->localAddr, - &ioc->localAddrLen) < 0) { + if (getsockname(cioc->fd, (struct sockaddr *)&cioc->localAddr, + &cioc->localAddrLen) < 0) { error_setg_errno(errp, socket_error(), "Unable to query local socket address"); goto error; } +#ifndef WIN32 + if (cioc->localAddr.ss_family == AF_UNIX) { + QIO_CHANNEL(cioc)->features |= (1 << QIO_CHANNEL_FEATURE_FD_PASS); + } +#endif /* WIN32 */ + trace_qio_channel_socket_accept_complete(ioc, cioc, cioc->fd); return cioc; diff --git a/tests/test-io-channel-socket.c b/tests/test-io-channel-socket.c index e76d54c3f8..b0eb5381b7 100644 --- a/tests/test-io-channel-socket.c +++ b/tests/test-io-channel-socket.c @@ -210,13 +210,19 @@ static void test_io_channel_setup_async(SocketAddress *listen_addr, static void test_io_channel(bool async, SocketAddress *listen_addr, - SocketAddress *connect_addr) + SocketAddress *connect_addr, + bool passFD) { QIOChannel *src, *dst; QIOChannelTest *test; if (async) { test_io_channel_setup_async(listen_addr, connect_addr, &src, &dst); + g_assert(!passFD || + qio_channel_has_feature(src, QIO_CHANNEL_FEATURE_FD_PASS)); + g_assert(!passFD || + qio_channel_has_feature(dst, QIO_CHANNEL_FEATURE_FD_PASS)); + test = qio_channel_test_new(); qio_channel_test_run_threads(test, true, src, dst); qio_channel_test_validate(test); @@ -226,6 +232,11 @@ static void test_io_channel(bool async, test_io_channel_setup_async(listen_addr, connect_addr, &src, &dst); + g_assert(!passFD || + qio_channel_has_feature(src, QIO_CHANNEL_FEATURE_FD_PASS)); + g_assert(!passFD || + qio_channel_has_feature(dst, QIO_CHANNEL_FEATURE_FD_PASS)); + test = qio_channel_test_new(); qio_channel_test_run_threads(test, false, src, dst); qio_channel_test_validate(test); @@ -235,6 +246,11 @@ static void test_io_channel(bool async, } else { test_io_channel_setup_sync(listen_addr, connect_addr, &src, &dst); + g_assert(!passFD || + qio_channel_has_feature(src, QIO_CHANNEL_FEATURE_FD_PASS)); + g_assert(!passFD || + qio_channel_has_feature(dst, QIO_CHANNEL_FEATURE_FD_PASS)); + test = qio_channel_test_new(); qio_channel_test_run_threads(test, true, src, dst); qio_channel_test_validate(test); @@ -244,6 +260,11 @@ static void test_io_channel(bool async, test_io_channel_setup_sync(listen_addr, connect_addr, &src, &dst); + g_assert(!passFD || + qio_channel_has_feature(src, QIO_CHANNEL_FEATURE_FD_PASS)); + g_assert(!passFD || + qio_channel_has_feature(dst, QIO_CHANNEL_FEATURE_FD_PASS)); + test = qio_channel_test_new(); qio_channel_test_run_threads(test, false, src, dst); qio_channel_test_validate(test); @@ -269,7 +290,7 @@ static void test_io_channel_ipv4(bool async) connect_addr->u.inet->host = g_strdup("127.0.0.1"); connect_addr->u.inet->port = NULL; /* Filled in later */ - test_io_channel(async, listen_addr, connect_addr); + test_io_channel(async, listen_addr, connect_addr, false); qapi_free_SocketAddress(listen_addr); qapi_free_SocketAddress(connect_addr); @@ -303,7 +324,7 @@ static void test_io_channel_ipv6(bool async) connect_addr->u.inet->host = g_strdup("::1"); connect_addr->u.inet->port = NULL; /* Filled in later */ - test_io_channel(async, listen_addr, connect_addr); + test_io_channel(async, listen_addr, connect_addr, false); qapi_free_SocketAddress(listen_addr); qapi_free_SocketAddress(connect_addr); @@ -337,7 +358,7 @@ static void test_io_channel_unix(bool async) connect_addr->u.q_unix = g_new0(UnixSocketAddress, 1); connect_addr->u.q_unix->path = g_strdup(TEST_SOCKET); - test_io_channel(async, listen_addr, connect_addr); + test_io_channel(async, listen_addr, connect_addr, true); qapi_free_SocketAddress(listen_addr); qapi_free_SocketAddress(connect_addr); |