From nobody Tue Feb 10 07:40:00 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; dkim=fail; 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513790804948201.66056616365017; Wed, 20 Dec 2017 09:26:44 -0800 (PST) Received: from localhost ([::1]:60385 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRi8c-0004w0-NU for importer@patchew.org; Wed, 20 Dec 2017 12:26:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56327) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRhyG-0004Yq-B6 for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:15:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eRhyC-0007Aw-Pk for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:15:56 -0500 Received: from mail-wr0-x234.google.com ([2a00:1450:400c:c0c::234]:34283) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eRhyC-0007AQ-G1 for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:15:52 -0500 Received: by mail-wr0-x234.google.com with SMTP id y21so22926268wrc.1 for ; Wed, 20 Dec 2017 09:15:52 -0800 (PST) Received: from 640k.lan (dynamic-adsl-78-12-251-125.clienti.tiscali.it. [78.12.251.125]) by smtp.gmail.com with ESMTPSA id f125sm2751101wme.45.2017.12.20.09.15.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Dec 2017 09:15:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=pfQLpMDKYsor1oD3ANjFSdbVhn39RBTxuYVCgbVqNks=; b=NI9IRY9HYl9UhL58/uuUECdzsdpNcVzXpz0mEWNS1aIztZ0K+KuOLMjf5lEe1lM84A 4lB4FaMoIzFN3/Mdn1+EZmi8LdYhVVJlem0Kz5znpRyqGLB4tn63lRUYcabpNjYjGzFp uqYu9yEtp/xOLnmeAC9192cJygCSeGDNldd+JVCve4V9p1qQiCxQ4Px0COPvwOH1u72z MTLMv4Djn/RsMKm6jy1pQy8Fc+GdHorKjsD0eIfduQAQi2fFJqPQW28QyaB5APo6y2Q9 Xp+QAjyGiXMUcQd1G5W9gsmUsgYA7VmeJMOEBSG+SHk6/YC9vVZzXk0j9IL9kNvTCDVv eJIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=pfQLpMDKYsor1oD3ANjFSdbVhn39RBTxuYVCgbVqNks=; b=F/WId57VUqf/+gnFyR52DIEXg2NFNaxyQ/BZ+KRjyYuTDNvGkOHw1RHy4MunhVuF7J iB9Dq8+dGWt721qDV4o8+Z2XcpfkMZS1FbfE6FdOINOjdKNWCDPZEJ/74pyrwtE04H3o GcOstln1EUkFVDSg2b1IEBUj/xwkP4o+YjJayPpo4z4LC+wsvH1VgmTrmMmXdElX+8RV pXBQL/wqvIE/epbC04DIxlvQyCigGstOgCS0Ss1Rbjf4z3oUg9DO826DsOZiy6nZ2jfT kUu5kIEZnN0MKMlHm26tozfgJZuqx8ZDfjzJ+1qNz7DHMSbGvLG8/RswXi/7On27M8hr B5/w== X-Gm-Message-State: AKGB3mJFzXunD+zQ4ExdnnYH7tyJAx3gVaXmjq+ItvTlwdlnknr9vYhO dfCFhekbg6p0hm75S8E3x1HLskJI X-Google-Smtp-Source: ACJfBot3gb2j/NgzXrjb3WEDlVnqqpUWOHOyu5a393N3+nDIm8oix5Sm/zjCVmu73aPXvBk64rEmYg== X-Received: by 10.223.196.243 with SMTP id o48mr9058819wrf.246.1513790151086; Wed, 20 Dec 2017 09:15:51 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 20 Dec 2017 18:14:28 +0100 Message-Id: <1513790098-9815-17-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1513790098-9815-1-git-send-email-pbonzini@redhat.com> References: <1513790098-9815-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::234 Subject: [Qemu-devel] [PULL 16/46] sockets: remove obsolete code that updated listen address 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Daniel P. Berrange" When listening on unix/tcp sockets there was optional code that would update the original SocketAddress struct with the info about the actual address th= at was listened on. Since the conversion of everything to QIOChannelSocket, no remaining caller made use of this feature. It has been replaced with the ab= ility to query the listen address after the fact using the function qio_channel_socket_get_local_address. This is a better model when the input address can result in listening on multiple distinct sockets. Signed-off-by: Daniel P. Berrange Reviewed-by: Peter Xu Message-Id: <20171212111219.32601-1-berrange@redhat.com> Signed-off-by: Paolo Bonzini --- include/qemu/sockets.h | 2 +- qga/channel-posix.c | 2 +- util/qemu-sockets.c | 31 +++++-------------------------- 3 files changed, 7 insertions(+), 28 deletions(-) diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h index 4f7311b..8889bcb 100644 --- a/include/qemu/sockets.h +++ b/include/qemu/sockets.h @@ -35,7 +35,7 @@ int inet_connect_saddr(InetSocketAddress *saddr, Error **= errp); =20 NetworkAddressFamily inet_netfamily(int family); =20 -int unix_listen(const char *path, char *ostr, int olen, Error **errp); +int unix_listen(const char *path, Error **errp); int unix_connect(const char *path, Error **errp); =20 SocketAddress *socket_parse(const char *str, Error **errp); diff --git a/qga/channel-posix.c b/qga/channel-posix.c index 3f34465..b812bf4 100644 --- a/qga/channel-posix.c +++ b/qga/channel-posix.c @@ -190,7 +190,7 @@ static gboolean ga_channel_open(GAChannel *c, const gch= ar *path, if (fd < 0) { Error *local_err =3D NULL; =20 - fd =3D unix_listen(path, NULL, strlen(path), &local_err); + fd =3D unix_listen(path, &local_err); if (local_err !=3D NULL) { g_critical("%s", error_get_pretty(local_err)); error_free(local_err); diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index af4f012..d6a1e17 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -198,7 +198,6 @@ static int try_bind(int socket, InetSocketAddress *sadd= r, struct addrinfo *e) =20 static int inet_listen_saddr(InetSocketAddress *saddr, int port_offset, - bool update_addr, Error **errp) { struct addrinfo ai,*res,*e; @@ -326,15 +325,6 @@ listen_failed: return -1; =20 listen_ok: - if (update_addr) { - g_free(saddr->host); - saddr->host =3D g_strdup(uaddr); - g_free(saddr->port); - saddr->port =3D g_strdup_printf("%d", - inet_getport(e) - port_offset); - saddr->has_ipv6 =3D saddr->ipv6 =3D e->ai_family =3D=3D PF_INET6; - saddr->has_ipv4 =3D saddr->ipv4 =3D e->ai_family !=3D PF_INET6; - } freeaddrinfo(res); return slisten; } @@ -790,7 +780,6 @@ static int vsock_parse(VsockSocketAddress *addr, const = char *str, #ifndef _WIN32 =20 static int unix_listen_saddr(UnixSocketAddress *saddr, - bool update_addr, Error **errp) { struct sockaddr_un un; @@ -855,12 +844,7 @@ static int unix_listen_saddr(UnixSocketAddress *saddr, goto err; } =20 - if (update_addr && pathbuf) { - g_free(saddr->path); - saddr->path =3D pathbuf; - } else { - g_free(pathbuf); - } + g_free(pathbuf); return sock; =20 err: @@ -920,7 +904,6 @@ static int unix_connect_saddr(UnixSocketAddress *saddr,= Error **errp) #else =20 static int unix_listen_saddr(UnixSocketAddress *saddr, - bool update_addr, Error **errp) { error_setg(errp, "unix sockets are not available on windows"); @@ -937,7 +920,7 @@ static int unix_connect_saddr(UnixSocketAddress *saddr,= Error **errp) #endif =20 /* compatibility wrapper */ -int unix_listen(const char *str, char *ostr, int olen, Error **errp) +int unix_listen(const char *str, Error **errp) { char *path, *optstr; int sock, len; @@ -957,11 +940,7 @@ int unix_listen(const char *str, char *ostr, int olen,= Error **errp) saddr->path =3D g_strdup(str); } =20 - sock =3D unix_listen_saddr(saddr, true, errp); - - if (sock !=3D -1 && ostr) { - snprintf(ostr, olen, "%s%s", saddr->path, optstr ? optstr : ""); - } + sock =3D unix_listen_saddr(saddr, errp); =20 qapi_free_UnixSocketAddress(saddr); return sock; @@ -1052,11 +1031,11 @@ int socket_listen(SocketAddress *addr, Error **errp) =20 switch (addr->type) { case SOCKET_ADDRESS_TYPE_INET: - fd =3D inet_listen_saddr(&addr->u.inet, 0, false, errp); + fd =3D inet_listen_saddr(&addr->u.inet, 0, errp); break; =20 case SOCKET_ADDRESS_TYPE_UNIX: - fd =3D unix_listen_saddr(&addr->u.q_unix, false, errp); + fd =3D unix_listen_saddr(&addr->u.q_unix, errp); break; =20 case SOCKET_ADDRESS_TYPE_FD: --=20 1.8.3.1