Commit bf535208 authored by Daniel P. Berrangé's avatar Daniel P. Berrangé
Browse files

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: default avatarDaniel P. Berrange <berrange@redhat.com>
parent d8d3c7cc

io/channel-socket.c

+1 −7
Original line number Diff line number Diff line
@@ -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;

}