From nobody Tue Feb 10 17:09:02 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502381859349865.9122138453679; Thu, 10 Aug 2017 09:17:39 -0700 (PDT) Received: from localhost ([::1]:53966 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dfq9R-00006I-Vl for importer@patchew.org; Thu, 10 Aug 2017 12:17:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46545) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dfpzJ-0006Pf-7S for qemu-devel@nongnu.org; Thu, 10 Aug 2017 12:07:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dfpzH-0003rc-J2 for qemu-devel@nongnu.org; Thu, 10 Aug 2017 12:07:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42333) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dfpzB-0003lj-9I; Thu, 10 Aug 2017 12:07:01 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4D875ADAF4; Thu, 10 Aug 2017 16:07:00 +0000 (UTC) Received: from t460.lcy.redhat.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFCB88AD70; Thu, 10 Aug 2017 16:06:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 4D875ADAF4 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=berrange@redhat.com From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Thu, 10 Aug 2017 17:04:49 +0100 Message-Id: <20170810160451.32723-7-berrange@redhat.com> In-Reply-To: <20170810160451.32723-1-berrange@redhat.com> References: <20170810160451.32723-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 10 Aug 2017 16:07:00 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 6/8] chardev: convert the socket server to QIONetListener X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, Juan Quintela , "Dr. David Alan Gilbert" , Max Reitz , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Instead of creating a QIOChannelSocket directly for the chardev server socket, use a QIONetListener. This provides the ability to listen on multiple sockets at the same time, so enables full support for IPv4/IPv6 dual stack. Signed-off-by: Daniel P. Berrange --- chardev/char-socket.c | 70 ++++++++++++++++++------------------------= ---- tests/test-sockets-proto.c | 8 ++---- 2 files changed, 29 insertions(+), 49 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 1ae730a4cb..96ff2a3ff4 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -25,6 +25,7 @@ #include "chardev/char.h" #include "io/channel-socket.h" #include "io/channel-tls.h" +#include "io/net-listener.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "qapi/clone-visitor.h" @@ -40,8 +41,7 @@ typedef struct { Chardev parent; QIOChannel *ioc; /* Client I/O channel */ QIOChannelSocket *sioc; /* Client master channel */ - QIOChannelSocket *listen_ioc; - guint listen_tag; + QIONetListener *listener; QCryptoTLSCreds *tls_creds; int connected; int max_size; @@ -93,9 +93,9 @@ static void check_report_connect_error(Chardev *chr, qemu_chr_socket_restart_timer(chr); } =20 -static gboolean tcp_chr_accept(QIOChannel *chan, - GIOCondition cond, - void *opaque); +static void tcp_chr_accept(QIONetListener *listener, + QIOChannelSocket *cioc, + void *opaque); =20 static int tcp_chr_read_poll(void *opaque); static void tcp_chr_disconnect(Chardev *chr); @@ -404,9 +404,8 @@ static void tcp_chr_disconnect(Chardev *chr) =20 tcp_chr_free_connection(chr); =20 - if (s->listen_ioc) { - s->listen_tag =3D qio_channel_add_watch( - QIO_CHANNEL(s->listen_ioc), G_IO_IN, tcp_chr_accept, chr, NULL= ); + if (s->listener) { + qio_net_listener_set_client_func(s->listener, tcp_chr_accept, chr,= NULL); } update_disconnected_filename(s); qemu_chr_be_event(chr, CHR_EVENT_CLOSED); @@ -704,9 +703,8 @@ static int tcp_chr_new_client(Chardev *chr, QIOChannelS= ocket *sioc) if (s->do_nodelay) { qio_channel_set_delay(s->ioc, false); } - if (s->listen_tag) { - g_source_remove(s->listen_tag); - s->listen_tag =3D 0; + if (s->listener) { + qio_net_listener_set_client_func(s->listener, NULL, NULL, NULL); } =20 if (s->tls_creds) { @@ -738,24 +736,14 @@ static int tcp_chr_add_client(Chardev *chr, int fd) return ret; } =20 -static gboolean tcp_chr_accept(QIOChannel *channel, - GIOCondition cond, - void *opaque) +static void tcp_chr_accept(QIONetListener *listener, + QIOChannelSocket *cioc, + void *opaque) { Chardev *chr =3D CHARDEV(opaque); - QIOChannelSocket *sioc; - - sioc =3D qio_channel_socket_accept(QIO_CHANNEL_SOCKET(channel), - NULL); - if (!sioc) { - return TRUE; - } - - tcp_chr_new_client(chr, sioc); =20 - object_unref(OBJECT(sioc)); - - return TRUE; + tcp_chr_set_client_ioc_name(chr, cioc); + tcp_chr_new_client(chr, cioc); } =20 static int tcp_chr_wait_connected(Chardev *chr, Error **errp) @@ -769,9 +757,10 @@ static int tcp_chr_wait_connected(Chardev *chr, Error = **errp) if (s->is_listen) { info_report("QEMU waiting for connection on: %s", chr->filename); - qio_channel_set_blocking(QIO_CHANNEL(s->listen_ioc), true, NUL= L); - tcp_chr_accept(QIO_CHANNEL(s->listen_ioc), G_IO_IN, chr); - qio_channel_set_blocking(QIO_CHANNEL(s->listen_ioc), false, NU= LL); + sioc =3D qio_net_listener_wait_client(s->listener); + tcp_chr_set_client_ioc_name(chr, sioc); + tcp_chr_new_client(chr, sioc); + object_unref(OBJECT(sioc)); } else { sioc =3D qio_channel_socket_new(); tcp_chr_set_client_ioc_name(chr, sioc); @@ -799,12 +788,9 @@ static void char_socket_finalize(Object *obj) s->reconnect_timer =3D 0; } qapi_free_SocketAddress(s->addr); - if (s->listen_tag) { - g_source_remove(s->listen_tag); - s->listen_tag =3D 0; - } - if (s->listen_ioc) { - object_unref(OBJECT(s->listen_ioc)); + if (s->listener) { + qio_net_listener_set_client_func(s->listener, NULL, NULL, NULL); + object_unref(OBJECT(s->listener)); } if (s->tls_creds) { object_unref(OBJECT(s->tls_creds)); @@ -937,29 +923,27 @@ static void qmp_chardev_open_socket(Chardev *chr, } else { if (s->is_listen) { char *name; - sioc =3D qio_channel_socket_new(); + s->listener =3D qio_net_listener_new(); =20 name =3D g_strdup_printf("chardev-tcp-listener-%s", chr->label= ); - qio_channel_set_name(QIO_CHANNEL(sioc), name); + qio_net_listener_set_name(s->listener, name); g_free(name); =20 - if (qio_channel_socket_listen_sync(sioc, s->addr, errp) < 0) { + if (qio_net_listener_open_sync(s->listener, s->addr, errp) < 0= ) { + object_unref(OBJECT(s->listener)); goto error; } =20 qapi_free_SocketAddress(s->addr); - s->addr =3D socket_local_address(sioc->fd, errp); + s->addr =3D socket_local_address(s->listener->sioc[0]->fd, err= p); update_disconnected_filename(s); =20 - s->listen_ioc =3D sioc; if (is_waitconnect && qemu_chr_wait_connected(chr, errp) < 0) { return; } if (!s->ioc) { - s->listen_tag =3D qio_channel_add_watch( - QIO_CHANNEL(s->listen_ioc), G_IO_IN, - tcp_chr_accept, chr, NULL); + qio_net_listener_set_client_func(s->listener, tcp_chr_acce= pt, chr, NULL); } } else if (qemu_chr_wait_connected(chr, errp) < 0) { goto error; diff --git a/tests/test-sockets-proto.c b/tests/test-sockets-proto.c index 1495369696..a92389bef6 100644 --- a/tests/test-sockets-proto.c +++ b/tests/test-sockets-proto.c @@ -18,7 +18,7 @@ typedef struct { const char *name; const char *args; int ipv4; /* 0 -> disabled, 1 -> enabled */ - int ipv6; /* 0 -> disabled, 1 -> enabled, -1 -> check getaddrinfo() or= der */ + int ipv6; /* 0 -> disabled, 1 -> enabled */ bool error; } QSocketsData; =20 @@ -189,8 +189,7 @@ static QSocketsData test_data[] =3D { =20 =20 /* Chardev with "" address */ - /* XXX multilistener bug - should be .ipv6 =3D 1 */ - { .ipv4 =3D 1, .ipv6 =3D -1, .error =3D false, + { .ipv4 =3D 1, .ipv6 =3D 1, .error =3D false, .name =3D "/sockets/chardev/wildcard/all", .args =3D "-chardev socket,id=3Dcdev0,host=3D,port=3D9000,server,now= ait" }, { .ipv4 =3D 1, .ipv6 =3D 0, .error =3D false, @@ -911,9 +910,6 @@ int main(int argc, char **argv) =20 for (i =3D 0; i < G_N_ELEMENTS(test_data); i++) { QSocketsData *data =3D &test_data[i]; - if (data->ipv6 =3D=3D -1) { - data->ipv6 =3D ipv6_first ? 1 : 0; - } g_test_add_data_func(data->name, data, test_listen); } =20 --=20 2.13.3