[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 04/11] io: set LISTEN flag explicitly for listen s
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PULL v1 04/11] io: set LISTEN flag explicitly for listen sockets |
Date: |
Thu, 27 Oct 2016 14:57:31 +0200 |
The SO_ACCEPTCONN ioctl is not portable across OS, with
some BSD versions and OS-X not supporting it. There is
no viable alternative to this, so instead just set the
feature explicitly when creating a listener socket.
The current users of qio_channel_socket_new_fd() won't
ever be given a listening socket, so there's no problem
with no auto-detecting it in this scenario
Signed-off-by: Daniel P. Berrange <address@hidden>
---
io/channel-socket.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/io/channel-socket.c b/io/channel-socket.c
index 75cbca3..d7e03f6 100644
--- a/io/channel-socket.c
+++ b/io/channel-socket.c
@@ -72,9 +72,6 @@ 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;
@@ -110,10 +107,6 @@ qio_channel_socket_set_fd(QIOChannelSocket *sioc,
qio_channel_set_feature(ioc, QIO_CHANNEL_FEATURE_FD_PASS);
}
#endif /* WIN32 */
- if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &val, &len) == 0 && val) {
- QIOChannel *ioc = QIO_CHANNEL(sioc);
- qio_channel_set_feature(ioc, QIO_CHANNEL_FEATURE_LISTEN);
- }
return 0;
@@ -220,6 +213,7 @@ int qio_channel_socket_listen_sync(QIOChannelSocket *ioc,
close(fd);
return -1;
}
+ qio_channel_set_feature(QIO_CHANNEL(ioc), QIO_CHANNEL_FEATURE_LISTEN);
return 0;
}
--
2.9.3
- [Qemu-devel] [PULL v1 00/11] Merge qio 2016/10/27, Daniel P. Berrange, 2016/10/27
- [Qemu-devel] [PULL v1 01/11] io: Fix double shift usages on QIOChannel features, Daniel P. Berrange, 2016/10/27
- [Qemu-devel] [PULL v1 02/11] io: Use qio_channel_has_feature() where applicable, Daniel P. Berrange, 2016/10/27
- [Qemu-devel] [PULL v1 04/11] io: set LISTEN flag explicitly for listen sockets,
Daniel P. Berrange <=
- [Qemu-devel] [PULL v1 06/11] io: add ability to set a name for IO channels, Daniel P. Berrange, 2016/10/27
- [Qemu-devel] [PULL v1 03/11] io: Introduce a qio_channel_set_feature() helper, Daniel P. Berrange, 2016/10/27
- [Qemu-devel] [PULL v1 07/11] nbd: set name for all I/O channels created, Daniel P. Berrange, 2016/10/27
- [Qemu-devel] [PULL v1 05/11] io: Add a QIOChannelSocket cleanup test, Daniel P. Berrange, 2016/10/27
- [Qemu-devel] [PULL v1 08/11] char: set name for all I/O channels created, Daniel P. Berrange, 2016/10/27
- [Qemu-devel] [PULL v1 10/11] vnc: set name for all I/O channels created, Daniel P. Berrange, 2016/10/27
- [Qemu-devel] [PULL v1 11/11] main: set names for main loop sources created, Daniel P. Berrange, 2016/10/27
- [Qemu-devel] [PULL v1 09/11] migration: set name for all I/O channels created, Daniel P. Berrange, 2016/10/27
- Re: [Qemu-devel] [PULL v1 00/11] Merge qio 2016/10/27, Peter Maydell, 2016/10/27