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>
This commit is contained in:
parent
d8d3c7cc67
commit
bf53520827
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user