From nobody Mon Feb 9 23:01:35 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652343398; cv=none; d=zohomail.com; s=zohoarc; b=b6XQ+KXHDi4KUkHUV2BgBWX+aEk4j74OVaz0qI6dVfwac2PAW/JiOsdrpI1khS+hkQPWl68toMqc4UVGvUOk1IRVNjY0kgenFl7jsTMj1XVDDsrGuQD4Njs9tJ4Q2k/z+sUDgslVPKhtlsrR2BdfQ/eXWpEdPQpMgkgSrUhzKiE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652343398; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wULMvXugYii2Tg7guHIxJYYW4i9YSf7uatLl/E6xtZE=; b=NbgUML4r6JE4douNtaEvsR01RM5dpgQdKmtdKCHLPifNKvlxHfMnmhSL+dWJaKDq3aHd/DKkuAsYfY4pHbFhsFwtuEDaHI/QaG76OPtRoohbWo/bWojIf/ahyNROJYlXhdj75qrKS2uKusMUYRZAieAUjhwQuIeWEXi3wiEDU6w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652343398404289.90009824046854; Thu, 12 May 2022 01:16:38 -0700 (PDT) Received: from localhost ([::1]:44780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1np3zw-0001gC-Sn for importer@patchew.org; Thu, 12 May 2022 04:16:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1np3tL-0006ix-5F for qemu-devel@nongnu.org; Thu, 12 May 2022 04:09:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:24400) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1np3tJ-0002kB-F7 for qemu-devel@nongnu.org; Thu, 12 May 2022 04:09:46 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-593-zYqttVqoOiG8NNFKAfv8ug-1; Thu, 12 May 2022 04:09:43 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 31A171C08975 for ; Thu, 12 May 2022 08:09:43 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.39.194.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D89D40CF8F4; Thu, 12 May 2022 08:09:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652342984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wULMvXugYii2Tg7guHIxJYYW4i9YSf7uatLl/E6xtZE=; b=Q8HldAgn0qdqxD+MfFM0U4xujfXeY1KWR5fmtw3cdQ5FGCFNbnXplly3TtFikEI3hIhT5T Ksb1FtTgzAdDp8oMhAFZU+prFNXXqiCGIZt4fVprfu/woic7Hqys6u0OLmIb2C5FoHuJ22 HFoAC1ge3FopTU8nEzBb8uaQiXPJJSE= X-MC-Unique: zYqttVqoOiG8NNFKAfv8ug-1 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Laurent Vivier Subject: [RFC PATCH v2 5/8] net: stream: add unix socket Date: Thu, 12 May 2022 10:09:29 +0200 Message-Id: <20220512080932.735962-6-lvivier@redhat.com> In-Reply-To: <20220512080932.735962-1-lvivier@redhat.com> References: <20220512080932.735962-1-lvivier@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=lvivier@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652343399321100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Laurent Vivier --- net/stream.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 99 insertions(+), 7 deletions(-) diff --git a/net/stream.c b/net/stream.c index 12fc26b9f4c7..dca50508ed84 100644 --- a/net/stream.c +++ b/net/stream.c @@ -234,7 +234,7 @@ static NetStreamState *net_stream_fd_init_stream(NetCli= entState *peer, static void net_stream_accept(void *opaque) { NetStreamState *s =3D opaque; - struct sockaddr_in saddr; + struct sockaddr_storage saddr; socklen_t len; int fd; =20 @@ -252,9 +252,27 @@ static void net_stream_accept(void *opaque) s->fd =3D fd; s->nc.link_down =3D false; net_stream_connect(s); - snprintf(s->nc.info_str, sizeof(s->nc.info_str), - "connection from %s:%d", - inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port)); + switch (saddr.ss_family) { + case AF_INET: { + struct sockaddr_in *saddr_in =3D (struct sockaddr_in *)&saddr; + + snprintf(s->nc.info_str, sizeof(s->nc.info_str), + "connection from %s:%d", + inet_ntoa(saddr_in->sin_addr), ntohs(saddr_in->sin_port)); + break; + } + case AF_UNIX: { + struct sockaddr_un saddr_un; + + len =3D sizeof(saddr_un); + getsockname(s->listen_fd, (struct sockaddr *)&saddr_un, &len); + snprintf(s->nc.info_str, sizeof(s->nc.info_str), + "connect from %s", saddr_un.sun_path); + break; + } + default: + g_assert_not_reached(); + } } =20 static int net_stream_server_init(NetClientState *peer, @@ -295,8 +313,40 @@ static int net_stream_server_init(NetClientState *peer, break; } case SOCKET_ADDRESS_TYPE_UNIX: { - error_setg(errp, "only support inet type"); - return -1; + struct sockaddr_un saddr_un; + + ret =3D unlink(addr->u.q_unix.path); + if (ret < 0 && errno !=3D ENOENT) { + error_setg_errno(errp, errno, "failed to unlink socket %s", + addr->u.q_unix.path); + return -1; + } + + saddr_un.sun_family =3D PF_UNIX; + ret =3D snprintf(saddr_un.sun_path, sizeof(saddr_un.sun_path), "%s= ", + addr->u.q_unix.path); + if (ret < 0 || ret >=3D sizeof(saddr_un.sun_path)) { + error_setg(errp, "UNIX socket path '%s' is too long", + addr->u.q_unix.path); + error_append_hint(errp, "Path must be less than %zu bytes\n", + sizeof(saddr_un.sun_path)); + } + + fd =3D qemu_socket(PF_UNIX, SOCK_STREAM, 0); + if (fd < 0) { + error_setg_errno(errp, errno, "can't create stream socket"); + return -1; + } + qemu_socket_set_nonblock(fd); + + ret =3D bind(fd, (struct sockaddr *)&saddr_un, sizeof(saddr_un)); + if (ret < 0) { + error_setg_errno(errp, errno, "can't create socket with path: = %s", + saddr_un.sun_path); + closesocket(fd); + return -1; + } + break; } case SOCKET_ADDRESS_TYPE_FD: fd =3D monitor_fd_param(monitor_cur(), addr->u.fd.str, errp); @@ -382,6 +432,48 @@ static int net_stream_client_init(NetClientState *peer, ntohs(saddr_in.sin_port)); break; } + case SOCKET_ADDRESS_TYPE_UNIX: { + struct sockaddr_un saddr_un; + + saddr_un.sun_family =3D PF_UNIX; + ret =3D snprintf(saddr_un.sun_path, sizeof(saddr_un.sun_path), "%s= ", + addr->u.q_unix.path); + if (ret < 0 || ret >=3D sizeof(saddr_un.sun_path)) { + error_setg(errp, "UNIX socket path '%s' is too long", + addr->u.q_unix.path); + error_append_hint(errp, "Path must be less than %zu bytes\n", + sizeof(saddr_un.sun_path)); + } + + fd =3D qemu_socket(PF_UNIX, SOCK_STREAM, 0); + if (fd < 0) { + error_setg_errno(errp, errno, "can't create stream socket"); + return -1; + } + qemu_socket_set_nonblock(fd); + + connected =3D 0; + for (;;) { + ret =3D connect(fd, (struct sockaddr *)&saddr_un, sizeof(saddr= _un)); + if (ret < 0) { + if (errno =3D=3D EINTR || errno =3D=3D EWOULDBLOCK) { + /* continue */ + } else if (errno =3D=3D EAGAIN || + errno =3D=3D EALREADY) { + break; + } else { + error_setg_errno(errp, errno, "can't connect socket"); + closesocket(fd); + return -1; + } + } else { + connected =3D 1; + break; + } + } + info_str =3D g_strdup_printf(" connect to %s", saddr_un.sun_path); + break; + } case SOCKET_ADDRESS_TYPE_FD: fd =3D monitor_fd_param(monitor_cur(), addr->u.fd.str, errp); if (fd =3D=3D -1) { @@ -397,7 +489,7 @@ static int net_stream_client_init(NetClientState *peer, info_str =3D g_strdup_printf("connect to fd %d", fd); break; default: - error_setg(errp, "only support inet or fd type"); + error_setg(errp, "only support inet, unix or fd type"); return -1; } =20 --=20 2.35.3