From 3fa27a9a1e20e8fb2bf4358d6873177d5d5c049a Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Thu, 16 Jun 2016 21:28:51 +0200 Subject: socket: add listen feature Add a flag to tell whether the channel socket is listening. Signed-off-by: Marc-André Lureau Message-Id: <1466105332-10285-3-git-send-email-marcandre.lureau@redhat.com> Acked-by: Daniel P. Berrange Signed-off-by: Paolo Bonzini Signed-off-by: Marc-André Lureau --- io/channel-socket.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'io/channel-socket.c') diff --git a/io/channel-socket.c b/io/channel-socket.c index ca8bc20b17..1cd58487b0 100644 --- a/io/channel-socket.c +++ b/io/channel-socket.c @@ -71,6 +71,9 @@ qio_channel_socket_set_fd(QIOChannelSocket *sioc, int fd, Error **errp) { + int val; + socklen_t len = sizeof(val); + if (sioc->fd != -1) { error_setg(errp, "Socket is already open"); return -1; @@ -106,6 +109,10 @@ qio_channel_socket_set_fd(QIOChannelSocket *sioc, ioc->features |= (1 << QIO_CHANNEL_FEATURE_FD_PASS); } #endif /* WIN32 */ + if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &val, &len) == 0 && val) { + QIOChannel *ioc = QIO_CHANNEL(sioc); + ioc->features |= (1 << QIO_CHANNEL_FEATURE_LISTEN); + } return 0; -- cgit v1.2.3-55-g7522 From 74b6ce43e3aacbb101018407196fc963e2c39fea Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Thu, 16 Jun 2016 21:28:52 +0200 Subject: socket: unlink unix socket on remove qemu leaves unix socket files behind when removing a listening chardev or leaving. qemu could clean that up, even if doing so isn't race-free. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1347077 Signed-off-by: Marc-André Lureau Message-Id: <1466105332-10285-4-git-send-email-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- include/qemu/sockets.h | 1 + io/channel-socket.c | 10 ++++++++++ tests/test-io-channel-socket.c | 2 +- util/qemu-sockets.c | 18 ++++++++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) (limited to 'io/channel-socket.c') diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h index 1bd92180f3..5dd2648169 100644 --- a/include/qemu/sockets.h +++ b/include/qemu/sockets.h @@ -51,6 +51,7 @@ SocketAddress *socket_parse(const char *str, Error **errp); int socket_connect(SocketAddress *addr, Error **errp, NonBlockingConnectHandler *callback, void *opaque); int socket_listen(SocketAddress *addr, Error **errp); +void socket_listen_cleanup(int fd, Error **errp); int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp); /* Old, ipv4 only bits. Don't use for new code. */ diff --git a/io/channel-socket.c b/io/channel-socket.c index 1cd58487b0..6ec87f8cdb 100644 --- a/io/channel-socket.c +++ b/io/channel-socket.c @@ -400,7 +400,17 @@ static void qio_channel_socket_init(Object *obj) static void qio_channel_socket_finalize(Object *obj) { QIOChannelSocket *ioc = QIO_CHANNEL_SOCKET(obj); + if (ioc->fd != -1) { + if (QIO_CHANNEL(ioc)->features & QIO_CHANNEL_FEATURE_LISTEN) { + Error *err = NULL; + + socket_listen_cleanup(ioc->fd, &err); + if (err) { + error_report_err(err); + err = NULL; + } + } #ifdef WIN32 WSAEventSelect(ioc->fd, NULL, 0); #endif diff --git a/tests/test-io-channel-socket.c b/tests/test-io-channel-socket.c index 855306b8dd..f73e063d7d 100644 --- a/tests/test-io-channel-socket.c +++ b/tests/test-io-channel-socket.c @@ -383,7 +383,7 @@ static void test_io_channel_unix(bool async) qapi_free_SocketAddress(listen_addr); qapi_free_SocketAddress(connect_addr); - unlink(TEST_SOCKET); + g_assert(g_file_test(TEST_SOCKET, G_FILE_TEST_EXISTS) == FALSE); } diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 0d6cd1f4ef..5d03695d10 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -997,6 +997,24 @@ int socket_listen(SocketAddress *addr, Error **errp) return fd; } +void socket_listen_cleanup(int fd, Error **errp) +{ + SocketAddress *addr; + + addr = socket_local_address(fd, errp); + + if (addr->type == SOCKET_ADDRESS_KIND_UNIX + && addr->u.q_unix.data->path) { + if (unlink(addr->u.q_unix.data->path) < 0 && errno != ENOENT) { + error_setg_errno(errp, errno, + "Failed to unlink socket %s", + addr->u.q_unix.data->path); + } + } + + g_free(addr); +} + int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp) { int fd; -- cgit v1.2.3-55-g7522