Commit 4e2d8bf6 authored by Juan Quintela's avatar Juan Quintela
Browse files

socket: Add num connections to qio_channel_socket_sync() 



Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent e5b6353c

include/io/channel-socket.h

+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ void qio_channel_socket_connect_async(QIOChannelSocket *ioc, 
 * qio_channel_socket_listen_sync:

 * @ioc: the socket channel object

 * @addr: the address to listen to

 * @num: the expected ammount of connections

 * @errp: pointer to a NULL-initialized error object

 *

 * Attempt to listen to the address @addr. This method
@@ -132,6 +133,7 @@ void qio_channel_socket_connect_async(QIOChannelSocket *ioc, 
 */

int qio_channel_socket_listen_sync(QIOChannelSocket *ioc,

                                   SocketAddress *addr,

                                   int num,

                                   Error **errp);



/**

io/channel-socket.c

+4 −3
Original line number Diff line number Diff line
@@ -197,12 +197,13 @@ void qio_channel_socket_connect_async(QIOChannelSocket *ioc, 


int qio_channel_socket_listen_sync(QIOChannelSocket *ioc,

                                   SocketAddress *addr,

                                   int num,

                                   Error **errp)

{

    int fd;



    trace_qio_channel_socket_listen_sync(ioc, addr);

    fd = socket_listen(addr, 1, errp);

    trace_qio_channel_socket_listen_sync(ioc, addr, num);

    fd = socket_listen(addr, num, errp);

    if (fd < 0) {

        trace_qio_channel_socket_listen_fail(ioc);

        return -1;
@@ -226,7 +227,7 @@ static void qio_channel_socket_listen_worker(QIOTask *task, 
    SocketAddress *addr = opaque;

    Error *err = NULL;



    qio_channel_socket_listen_sync(ioc, addr, &err);

    qio_channel_socket_listen_sync(ioc, addr, 1, &err);



    qio_task_set_error(task, err);

}

io/net-listener.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ int qio_net_listener_open_sync(QIONetListener *listener, 
    for (i = 0; i < nresaddrs; i++) {

        QIOChannelSocket *sioc = qio_channel_socket_new();



        if (qio_channel_socket_listen_sync(sioc, resaddrs[i],

        if (qio_channel_socket_listen_sync(sioc, resaddrs[i], 1,

                                           err ? NULL : &err) == 0) {

            success = true;

io/trace-events

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ qio_channel_socket_connect_sync(void *ioc, void *addr) "Socket connect sync ioc= 
qio_channel_socket_connect_async(void *ioc, void *addr) "Socket connect async ioc=%p addr=%p"

qio_channel_socket_connect_fail(void *ioc) "Socket connect fail ioc=%p"

qio_channel_socket_connect_complete(void *ioc, int fd) "Socket connect complete ioc=%p fd=%d"

qio_channel_socket_listen_sync(void *ioc, void *addr) "Socket listen sync ioc=%p addr=%p"

qio_channel_socket_listen_sync(void *ioc, void *addr, int num) "Socket listen sync ioc=%p addr=%p num=%d"

qio_channel_socket_listen_async(void *ioc, void *addr) "Socket listen async ioc=%p addr=%p"

qio_channel_socket_listen_fail(void *ioc) "Socket listen fail ioc=%p"

qio_channel_socket_listen_complete(void *ioc, int fd) "Socket listen complete ioc=%p fd=%d"

scsi/qemu-pr-helper.c

+2 −1
Original line number Diff line number Diff line
@@ -1005,7 +1005,8 @@ int main(int argc, char **argv) 
            .u.q_unix.path = socket_path,

        };

        server_ioc = qio_channel_socket_new();

        if (qio_channel_socket_listen_sync(server_ioc, &saddr, &local_err) < 0) {

        if (qio_channel_socket_listen_sync(server_ioc, &saddr,

                                           1, &local_err) < 0) {

            object_unref(OBJECT(server_ioc));

            error_report_err(local_err);

            return 1;