aboutsummaryrefslogtreecommitdiff
path: root/io/channel-socket.c
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2016-10-26 18:20:20 +0200
committerDaniel P. Berrange <berrange@redhat.com>2016-10-27 09:13:00 +0200
commitbf5352082727df7207c54cf3fc5fb608dc2b1fda (patch)
tree515c46e2c2b3f23810466f578b8d6b907b2286a0 /io/channel-socket.c
parentd8d3c7cc672d89b26180a404d6f0b03494160cf5 (diff)
io: set LISTEN flag explicitly for listen sockets
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 <berrange@redhat.com>
Diffstat (limited to 'io/channel-socket.c')
-rw-r--r--io/channel-socket.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/io/channel-socket.c b/io/channel-socket.c
index 75cbca3c55..d7e03f6266 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;
}