From nobody Mon Feb 9 08:56:50 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=1657045649; cv=none; d=zohomail.com; s=zohoarc; b=MF+ez5WcLppu8zjnyqm+4GfBof8vf7lSphdXb9IjBfgfemZ7KjALoR9bza0aWPSnUq/eT4EaXapCo5GT4hwl4hzQVbJJuXRgWgoKsN+PEa0aiU8x1cLKq+Nxy54//UkHHZHueu2iOreD0CLJEeyg3xqA3TQizmNMmozc1GUnzuo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657045649; 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=kJAU+7InORxMPHxiYkKkGEeyXytUsbFefHrNh/X56pk=; b=Q9uURZGvsHJC6QUq/CSLuWVEGt3UeDcJrwjwQjuj3icMUuE2O7j8MZgJS9AMiaUGPkSP6Zx7VJDIyDL2dePSa0O7scl6NVmzmoHddvLt3r+PEpG3/rd+N7RsfEz1TVyKfvxXepTv7F481FwFC1q2jDsN7xLgf1oDaFPAfeA8ZR0= 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 165704564921765.77490561757975; Tue, 5 Jul 2022 11:27:29 -0700 (PDT) Received: from localhost ([::1]:36946 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o8nGh-0001Sh-4a for importer@patchew.org; Tue, 05 Jul 2022 14:27:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8n93-0007ef-AW for qemu-devel@nongnu.org; Tue, 05 Jul 2022 14:19:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:28287) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8n91-00015F-KW for qemu-devel@nongnu.org; Tue, 05 Jul 2022 14:19:33 -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-605-Xpz7PlkPNMW-VsQzjP7GCw-1; Tue, 05 Jul 2022 14:19:29 -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 AB80C18A64EB for ; Tue, 5 Jul 2022 18:19:29 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.39.192.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 19D6E40466BC; Tue, 5 Jul 2022 18:19:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657045171; 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=kJAU+7InORxMPHxiYkKkGEeyXytUsbFefHrNh/X56pk=; b=cHWHfnJCrfqxjixkvaUgAH4+TMdVkhG2XH3TfpPZlGrcO9v5rNmoOIiJ0AHpSmc9EYA5jx i+uOORfOlxe9ov46Xp+6/JDGK74c+90xrprCjurFGQeycQdsRsP4N8hS72HQBPLYEjnWQf K3rW8yNKapEq9WSUtyFJ62xaGTLGcGI= X-MC-Unique: Xpz7PlkPNMW-VsQzjP7GCw-1 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Eric Blake , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Markus Armbruster , "Dr. David Alan Gilbert" , Paolo Bonzini , Jason Wang , Laurent Vivier , Stefano Brivio Subject: [PATCH v6 09/13] net: dgram: move mcast specific code from net_socket_fd_init_dgram() Date: Tue, 5 Jul 2022 20:19:04 +0200 Message-Id: <20220705181908.1375601-10-lvivier@redhat.com> In-Reply-To: <20220705181908.1375601-1-lvivier@redhat.com> References: <20220705181908.1375601-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: 1657045650978100001 Content-Type: text/plain; charset="utf-8" It is less complex to manage special cases directly in net_dgram_mcast_init() and net_dgram_udp_init(). Signed-off-by: Laurent Vivier Reviewed-by: Stefano Brivio --- net/dgram.c | 143 +++++++++++++++++++++++++++------------------------- 1 file changed, 73 insertions(+), 70 deletions(-) diff --git a/net/dgram.c b/net/dgram.c index dcc2205305c5..16e2d909755c 100644 --- a/net/dgram.c +++ b/net/dgram.c @@ -302,52 +302,11 @@ static NetClientInfo net_dgram_socket_info =3D { static NetDgramState *net_dgram_fd_init_dgram(NetClientState *peer, const char *model, const char *name, - int fd, int is_fd, - SocketAddress *mcast, + int fd, Error **errp) { - struct sockaddr_in *saddr =3D NULL; - int newfd; NetClientState *nc; NetDgramState *s; - SocketAddress *sa; - SocketAddressType sa_type; - - sa =3D socket_local_address(fd, errp); - if (!sa) { - return NULL; - } - sa_type =3D sa->type; - qapi_free_SocketAddress(sa); - - /* - * fd passed: multicast: "learn" dgram_dst address from bound address = and - * save it. Because this may be "shared" socket from a "master" proces= s, - * datagrams would be recv() by ONLY ONE process: we must "clone" this - * dgram socket --jjo - */ - - if (is_fd && mcast !=3D NULL) { - saddr =3D g_new(struct sockaddr_in, 1); - - if (convert_host_port(saddr, mcast->u.inet.host, mcast->u.inet= .port, - errp) < 0) { - goto err; - } - /* must be bound */ - if (saddr->sin_addr.s_addr =3D=3D 0) { - error_setg(errp, "can't setup multicast destination addres= s"); - goto err; - } - /* clone dgram socket */ - newfd =3D net_dgram_mcast_create(saddr, NULL, errp); - if (newfd < 0) { - goto err; - } - /* clone newfd to fd, close newfd */ - dup2(newfd, fd); - close(newfd); - } =20 nc =3D qemu_new_net_client(&net_dgram_socket_info, peer, model, name); =20 @@ -359,24 +318,7 @@ static NetDgramState *net_dgram_fd_init_dgram(NetClien= tState *peer, net_socket_rs_init(&s->rs, net_dgram_rs_finalize, false); net_dgram_read_poll(s, true); =20 - /* mcast: save bound address as dst */ - if (saddr) { - g_assert(s->dgram_dst =3D=3D NULL); - s->dgram_dst =3D (struct sockaddr *)saddr; - snprintf(nc->info_str, sizeof(nc->info_str), - "fd=3D%d (cloned mcast=3D%s:%d)", - fd, inet_ntoa(saddr->sin_addr), ntohs(saddr->sin_port)); - } else { - snprintf(nc->info_str, sizeof(nc->info_str), "fd=3D%d %s", fd, - SocketAddressType_str(sa_type)); - } - return s; - -err: - g_free(saddr); - closesocket(fd); - return NULL; } =20 static void net_dgram_connect(void *opaque) @@ -421,6 +363,7 @@ static int net_dgram_mcast_init(NetClientState *peer, NetDgramState *s; int fd, ret; struct sockaddr_in *saddr; + gchar *info_str; =20 if (remote->type !=3D SOCKET_ADDRESS_TYPE_INET) { error_setg(errp, "multicast only support inet type"); @@ -440,6 +383,9 @@ static int net_dgram_mcast_init(NetClientState *peer, g_free(saddr); return -1; } + info_str =3D g_strdup_printf("mcast=3D%s:%d", + inet_ntoa(saddr->sin_addr), + ntohs(saddr->sin_port)); } else { switch (local->type) { case SOCKET_ADDRESS_TYPE_INET: { @@ -457,9 +403,14 @@ static int net_dgram_mcast_init(NetClientState *peer, g_free(saddr); return -1; } + info_str =3D g_strdup_printf("mcast=3D%s:%d", + inet_ntoa(saddr->sin_addr), + ntohs(saddr->sin_port)); break; } - case SOCKET_ADDRESS_TYPE_FD: + case SOCKET_ADDRESS_TYPE_FD: { + int newfd; + fd =3D monitor_fd_param(monitor_cur(), local->u.fd.str, errp); if (fd =3D=3D -1) { g_free(saddr); @@ -472,7 +423,46 @@ static int net_dgram_mcast_init(NetClientState *peer, name, fd); return -1; } + + /* + * fd passed: multicast: "learn" dgram_dst address from bound + * address and save it. Because this may be "shared" socket fr= om a + * "master" process, datagrams would be recv() by ONLY ONE pro= cess: + * we must "clone" this dgram socket --jjo + */ + + saddr =3D g_new(struct sockaddr_in, 1); + + if (convert_host_port(saddr, local->u.inet.host, local->u.inet= .port, + errp) < 0) { + g_free(saddr); + closesocket(fd); + return -1; + } + + /* must be bound */ + if (saddr->sin_addr.s_addr =3D=3D 0) { + error_setg(errp, "can't setup multicast destination addres= s"); + g_free(saddr); + closesocket(fd); + return -1; + } + /* clone dgram socket */ + newfd =3D net_dgram_mcast_create(saddr, NULL, errp); + if (newfd < 0) { + g_free(saddr); + closesocket(fd); + return -1; + } + /* clone newfd to fd, close newfd */ + dup2(newfd, fd); + close(newfd); + + info_str =3D g_strdup_printf("fd=3D%d (cloned mcast=3D%s:%d)", + fd, inet_ntoa(saddr->sin_addr), + ntohs(saddr->sin_port)); break; + } default: g_free(saddr); error_setg(errp, "only support inet or fd type for local"); @@ -480,9 +470,7 @@ static int net_dgram_mcast_init(NetClientState *peer, } } =20 - s =3D net_dgram_fd_init_dgram(peer, model, name, fd, - local->type =3D=3D SOCKET_ADDRESS_TYPE_FD, - remote, errp); + s =3D net_dgram_fd_init_dgram(peer, model, name, fd, errp); if (!s) { g_free(saddr); return -1; @@ -491,8 +479,8 @@ static int net_dgram_mcast_init(NetClientState *peer, g_assert(s->dgram_dst =3D=3D NULL); s->dgram_dst =3D (struct sockaddr *)saddr; =20 - snprintf(s->nc.info_str, sizeof(s->nc.info_str), "mcast=3D%s:%d", - inet_ntoa(saddr->sin_addr), ntohs(saddr->sin_port)); + pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), info_str); + g_free(info_str); =20 return 0; =20 @@ -571,7 +559,10 @@ static int net_dgram_udp_init(NetClientState *peer, =20 break; } - case SOCKET_ADDRESS_TYPE_FD: + case SOCKET_ADDRESS_TYPE_FD: { + SocketAddress *sa; + SocketAddressType sa_type; + fd =3D monitor_fd_param(monitor_cur(), local->u.fd.str, errp); if (fd =3D=3D -1) { return -1; @@ -582,23 +573,35 @@ static int net_dgram_udp_init(NetClientState *peer, name, fd); return -1; } + + sa =3D socket_local_address(fd, errp); + if (sa) { + sa_type =3D sa->type; + qapi_free_SocketAddress(sa); + + info_str =3D g_strdup_printf("fd=3D%d %s", fd, + SocketAddressType_str(sa_type)); + } else { + info_str =3D g_strdup_printf("fd=3D%d", fd); + } break; + } default: error_setg(errp, "only support inet or fd type for local"); return -1; } =20 - s =3D net_dgram_fd_init_dgram(peer, model, name, fd, 0, NULL, errp); + s =3D net_dgram_fd_init_dgram(peer, model, name, fd, errp); if (!s) { return -1; } =20 + pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), info_str); + g_free(info_str); + if (remote) { g_assert(s->dgram_dst =3D=3D NULL); s->dgram_dst =3D dgram_dst; - - pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), info_str); - g_free(info_str); } return 0; } --=20 2.36.1