From nobody Tue Feb 10 01:35:07 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=1652118064; cv=none; d=zohomail.com; s=zohoarc; b=nsfSBjf5CHRn/+P8Bq8JOkdXvWVQ8hRkGoJiXJp5P3qC7ufYz2l9FDne7TQmFyZBm4oGjIt3XSWNs6NSrCrhVPKY3dYvz+70c5O/BNhDWw3KTGGUrdn9RHPgvALLfX9rXbCSAM1YAAWc35sOLo2yV0S6syhlyoNzDp/DtL/ECP0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652118064; 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=YutrgKZ7iFce0zcC4Umgg+61KI1+JXyrciTT/AsU/uk=; b=lfDqI36OHpQlSeUQMbpp9nJEUZbJf+Ypo+dMxZ4dheO41wc1kYZpluneuwLwFeku/hE7z35mg5we3YmM/700SYiHBlvvfhIDtI6g9e70ees+q4UJtqcuY043Mtxw6oFZEnAfrgpIcxZHtgxJIWLyLnEhmW4FW3bl9Ot/meCmEbM= 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 1652118064775173.4397235668; Mon, 9 May 2022 10:41:04 -0700 (PDT) Received: from localhost ([::1]:43396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1no7NV-0001JS-Fs for importer@patchew.org; Mon, 09 May 2022 13:41:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1no7J8-00071w-Ih for qemu-devel@nongnu.org; Mon, 09 May 2022 13:36:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:27010) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1no7J6-00012S-A7 for qemu-devel@nongnu.org; Mon, 09 May 2022 13:36:30 -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-107-wvEsRexkP3mp9-meeFAuvg-1; Mon, 09 May 2022 13:36:26 -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 1498B811E76 for ; Mon, 9 May 2022 17:36:26 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.39.194.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5894940CFD0C; Mon, 9 May 2022 17:36:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652117787; 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=YutrgKZ7iFce0zcC4Umgg+61KI1+JXyrciTT/AsU/uk=; b=DRQdZXL0etfQnODbu1gAevh34p7Uglgi+IATgVWTIARt0CvVd8wbxT4FJJ1Cg0+GR9REaN ZUzVX6g9pmNTrOX/1ZXHEzhHQO2uXr9nEIbtDl7DykS+ABiQYsh4GHPvmAFBZmAhwAYCl+ EuH8Nb2rMSivlLr/hmhC6hfLWaSvBys= X-MC-Unique: wvEsRexkP3mp9-meeFAuvg-1 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Laurent Vivier Subject: [RFC PATCH 4/6] net: socket-ng: make dgram_dst generic Date: Mon, 9 May 2022 19:36:16 +0200 Message-Id: <20220509173618.467207-5-lvivier@redhat.com> In-Reply-To: <20220509173618.467207-1-lvivier@redhat.com> References: <20220509173618.467207-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: 1652118066230100001 Content-Type: text/plain; charset="utf-8" dgram_dst is a sockaddr_in structure. To be able to use it with unix socket, use a pointer to a generic sockaddr structure. Signed-off-by: Laurent Vivier --- net/socket-ng.c | 76 ++++++++++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 30 deletions(-) diff --git a/net/socket-ng.c b/net/socket-ng.c index 2c70440a2b57..0056924dc02b 100644 --- a/net/socket-ng.c +++ b/net/socket-ng.c @@ -40,8 +40,8 @@ typedef struct NetSocketNGState { int fd; SocketReadState rs; unsigned int send_index; /* number of bytes sent (only SOCK_STREA= M) */ - /* contains inet host and port destination iff connectionless (SOCK_DGRA= M) */ - struct sockaddr_in dgram_dst; + /* contains destination iff connectionless (SOCK_DGRA= M) */ + struct sockaddr *dgram_dst; IOHandler *send_fn; /* differs between SOCK_STREAM/SOCK_DGRA= M */ bool read_poll; /* waiting to receive data? */ bool write_poll; /* waiting to transmit data? */ @@ -122,10 +122,9 @@ static ssize_t net_socket_receive_dgram(NetClientState= *nc, ssize_t ret; =20 do { - if (s->dgram_dst.sin_family !=3D AF_UNIX) { - ret =3D sendto(s->fd, buf, size, 0, - (struct sockaddr *)&s->dgram_dst, - sizeof(s->dgram_dst)); + if (s->dgram_dst) { + ret =3D sendto(s->fd, buf, size, 0, s->dgram_dst, + sizeof(struct sockaddr_in)); } else { ret =3D send(s->fd, buf, size, 0); } @@ -327,6 +326,8 @@ static void net_socket_cleanup(NetClientState *nc) closesocket(s->listen_fd); s->listen_fd =3D -1; } + g_free(s->dgram_dst); + s->dgram_dst =3D NULL; } =20 static NetClientInfo net_dgram_socket_info =3D { @@ -343,7 +344,7 @@ static NetSocketNGState *net_socket_fd_init_dgram(NetCl= ientState *peer, SocketAddress *mcast, Error **errp) { - struct sockaddr_in saddr; + struct sockaddr_in *saddr =3D NULL; int newfd; NetClientState *nc; NetSocketNGState *s; @@ -365,17 +366,19 @@ static NetSocketNGState *net_socket_fd_init_dgram(Net= ClientState *peer, */ =20 if (is_fd && mcast !=3D NULL) { - if (convert_host_port(&saddr, mcast->u.inet.host, - mcast->u.inet.port, errp) < 0) { + 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) { + 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_socket_mcast_create(&saddr, NULL, errp); + newfd =3D net_socket_mcast_create(saddr, NULL, errp); if (newfd < 0) { goto err; } @@ -395,16 +398,13 @@ static NetSocketNGState *net_socket_fd_init_dgram(Net= ClientState *peer, net_socket_read_poll(s, true); =20 /* mcast: save bound address as dst */ - if (is_fd && mcast !=3D NULL) { - s->dgram_dst =3D saddr; + 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), "socket-ng: fd=3D%d (cloned mcast=3D%s:%d)", - fd, inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port)); + fd, inet_ntoa(saddr->sin_addr), ntohs(saddr->sin_port)); } else { - if (sa_type =3D=3D SOCKET_ADDRESS_TYPE_UNIX) { - s->dgram_dst.sin_family =3D AF_UNIX; - } - snprintf(nc->info_str, sizeof(nc->info_str), "socket-ng: fd=3D%d %s", fd, SocketAddressType_str(sa_typ= e)); } @@ -412,6 +412,7 @@ static NetSocketNGState *net_socket_fd_init_dgram(NetCl= ientState *peer, return s; =20 err: + g_free(saddr); closesocket(fd); return NULL; } @@ -741,21 +742,24 @@ static int net_socketng_mcast_init(NetClientState *pe= er, { NetSocketNGState *s; int fd, ret; - struct sockaddr_in saddr; + struct sockaddr_in *saddr; =20 if (remote->type !=3D SOCKET_ADDRESS_TYPE_INET) { error_setg(errp, "multicast only support inet type"); return -1; } =20 - if (convert_host_port(&saddr, remote->u.inet.host, remote->u.inet.port, + saddr =3D g_new(struct sockaddr_in, 1); + if (convert_host_port(saddr, remote->u.inet.host, remote->u.inet.port, errp) < 0) { + g_free(saddr); return -1; } =20 if (!local) { - fd =3D net_socket_mcast_create(&saddr, NULL, errp); + fd =3D net_socket_mcast_create(saddr, NULL, errp); if (fd < 0) { + g_free(saddr); return -1; } } else { @@ -764,13 +768,15 @@ static int net_socketng_mcast_init(NetClientState *pe= er, struct in_addr localaddr; =20 if (inet_aton(local->u.inet.host, &localaddr) =3D=3D 0) { + g_free(saddr); error_setg(errp, "localaddr '%s' is not a valid IPv4 addre= ss", local->u.inet.host); return -1; } =20 - fd =3D net_socket_mcast_create(&saddr, &localaddr, errp); + fd =3D net_socket_mcast_create(saddr, &localaddr, errp); if (fd < 0) { + g_free(saddr); return -1; } break; @@ -778,16 +784,19 @@ static int net_socketng_mcast_init(NetClientState *pe= er, case SOCKET_ADDRESS_TYPE_FD: fd =3D monitor_fd_param(monitor_cur(), local->u.fd.str, errp); if (fd =3D=3D -1) { + g_free(saddr); return -1; } ret =3D qemu_socket_try_set_nonblock(fd); if (ret < 0) { + g_free(saddr); error_setg_errno(errp, -ret, "%s: Can't use file descripto= r %d", name, fd); return -1; } break; default: + g_free(saddr); error_setg(errp, "only support inet or fd type for local"); return -1; } @@ -797,14 +806,17 @@ static int net_socketng_mcast_init(NetClientState *pe= er, local->type =3D=3D SOCKET_ADDRESS_TYPE_FD, remote, errp); if (!s) { + g_free(saddr); return -1; } =20 - s->dgram_dst =3D saddr; + 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), "socket-ng: mcast=3D%s:%d", - inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port)); + inet_ntoa(saddr->sin_addr), ntohs(saddr->sin_port)); + return 0; =20 } @@ -818,8 +830,8 @@ static int net_socketng_udp_init(NetClientState *peer, { NetSocketNGState *s; int fd, ret; - struct sockaddr_in raddr_in; gchar *info_str; + struct sockaddr *dgram_dst; =20 if (remote) { if (local->type =3D=3D SOCKET_ADDRESS_TYPE_FD) { @@ -840,7 +852,7 @@ static int net_socketng_udp_init(NetClientState *peer, =20 switch (local->type) { case SOCKET_ADDRESS_TYPE_INET: { - struct sockaddr_in laddr_in; + struct sockaddr_in laddr_in, raddr_in; =20 if (convert_host_port(&laddr_in, local->u.inet.host, local->u.inet= .port, errp) < 0) { @@ -874,9 +886,12 @@ static int net_socketng_udp_init(NetClientState *peer, } qemu_socket_set_nonblock(fd); =20 + dgram_dst =3D g_malloc(sizeof(raddr_in)); + memcpy(dgram_dst, &raddr_in, sizeof(raddr_in)); + info_str =3D g_strdup_printf("socket-ng: udp=3D%s:%d/%s:%d", - inet_ntoa(laddr_in.sin_addr), ntohs(laddr_in.sin_port), - inet_ntoa(raddr_in.sin_addr), ntohs(raddr_in.sin_port)); + inet_ntoa(laddr_in.sin_addr), ntohs(laddr_in.sin_p= ort), + inet_ntoa(raddr_in.sin_addr), ntohs(raddr_in.sin_p= ort)); =20 break; } @@ -903,13 +918,14 @@ static int net_socketng_udp_init(NetClientState *peer, } =20 if (remote) { - s->dgram_dst =3D raddr_in; + g_assert(s->dgram_dst =3D=3D NULL); + s->dgram_dst =3D dgram_dst; =20 pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), info_str); g_free(info_str); } return 0; -} +}; =20 static int net_socketng_dgram_init(NetClientState *peer, const char *model, --=20 2.35.3