From nobody Tue Feb 10 02:42:58 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=1655720871; cv=none; d=zohomail.com; s=zohoarc; b=EwLfW763KspwT4M84zA3Uo/NUbyicEeTOOxFXi3pWB+jjCaY+hHafkaeB5z/UkEAGmYKel/W49XzqaqY03QnibvbxAuDuROYDmkL+BwclziQqHAKOTxZUWYBKTUeIdQ4YyhJ2hAaydg4d4isclDzqZiavNIC0adP2qTu4iZsRmU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655720871; 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=TdSl0Wma9r+2Zrg1Bat0Z2/9CgDDRhqBKpUhqXgmX+o=; b=Edm1CWtCUiHKQLjD2jl4WB1lqBJsgBvzllCiQ0OiUyLqA5H6lhX42h0l5cHsF75std8v41fFhHX3mtApaUairISx4WOj0XNmVt6U8fWvb98ep3h7pcK2dyJcPcI06Wn46L6dLxantsLYZIinrqf85QzNB+eSBRwcfrm3Ioxufb4= 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 165572087147844.97217908674634; Mon, 20 Jun 2022 03:27:51 -0700 (PDT) Received: from localhost ([::1]:36342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o3EdK-0003Xs-Fu for importer@patchew.org; Mon, 20 Jun 2022 06:27:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3EUY-0006YD-M6 for qemu-devel@nongnu.org; Mon, 20 Jun 2022 06:18:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:40753) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3EUX-0007VH-3b for qemu-devel@nongnu.org; Mon, 20 Jun 2022 06:18:46 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-222-DWOF4_XyMWmZAuHoaxBWpA-1; Mon, 20 Jun 2022 06:18:43 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 205CB85A583 for ; Mon, 20 Jun 2022 10:18:43 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.39.193.145]) by smtp.corp.redhat.com (Postfix) with ESMTP id 72BCC492C3B; Mon, 20 Jun 2022 10:18:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655720324; 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=TdSl0Wma9r+2Zrg1Bat0Z2/9CgDDRhqBKpUhqXgmX+o=; b=QHLFa98UB60aM/IbA/hlZd3Dmfz9yCwaymh3ebmkNeZQbHFWBFSBWt4jl4X9RmckNUzREr MhckiYPMSDaVFeJ5ew0nyi/mtUW7V/1tNME0IiErArYEYYWl3qgbmarLbIx0RYaFX4nz3H 92b77o/jFAsO8e4cg6kTBwZlSOYHOqU= X-MC-Unique: DWOF4_XyMWmZAuHoaxBWpA-1 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Markus Armbruster , Eric Blake , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jason Wang , Laurent Vivier , Stefano Brivio Subject: [RFC PATCH v3 06/11] net: stream: add unix socket Date: Mon, 20 Jun 2022 12:18:23 +0200 Message-Id: <20220620101828.518865-7-lvivier@redhat.com> In-Reply-To: <20220620101828.518865-1-lvivier@redhat.com> References: <20220620101828.518865-1-lvivier@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 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.133.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: 1655720872824100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Laurent Vivier Reviewed-by: Stefano Brivio --- 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.36.1