From nobody Wed May 15 04:04:06 2024 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=1652118673; cv=none; d=zohomail.com; s=zohoarc; b=chJIi7p0VL8NkIKjF46iR++IEgUNJo1gZkyFWELsEv4qVrNjG1/W6P1cN6jaJ8daGvZkn2+Akq2SWX2TdzaREFYgRRUEYNjFguZKcZMlELH5/LRBLf4qEyYQMJWMAw1gSrLuoEmEHEe/g1ceDGc9kbMm0N3xN8NbiKT6hbcQzMQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652118673; 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=lQ461eKF56EY0djFo1y69Sg4lrRbfot/mXEIxyS0QME=; b=GZoe7jQw3u3XTIkIFMY2NJnbnwP974C3VVE8drsGyXKp5Il0WLHlCTv4sUbmJUPj7zgP/E/AAsaR1TVmiJtzb2zd7BlemUXNUJdXGGr4zu7A25LGDK9Lt4g4cQk2YecDDryLB+S/FvzZe/e8GGS0v0p0TkmZzIFI5zOa9fJ1tas= 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 1652118673036117.57599550669988; Mon, 9 May 2022 10:51:13 -0700 (PDT) Received: from localhost ([::1]:59956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1no7XL-0004NV-Hd for importer@patchew.org; Mon, 09 May 2022 13:51:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1no7JN-0007MJ-IP for qemu-devel@nongnu.org; Mon, 09 May 2022 13:36:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:47239) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1no7JM-000142-01 for qemu-devel@nongnu.org; Mon, 09 May 2022 13:36:45 -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-546-m847oMWQMl--cnCCdWgbDg-1; Mon, 09 May 2022 13:36:42 -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 235CA1019E1D for ; Mon, 9 May 2022 17:36:22 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.39.194.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 838CC4010157; Mon, 9 May 2022 17:36:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652117803; 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=lQ461eKF56EY0djFo1y69Sg4lrRbfot/mXEIxyS0QME=; b=e0bbS6A3lDiGKxBQuZQ0skEc0clvlSthVoxQmGWCnvQMJDsm+jmOxM7WEG4kwM2hgZR7j9 2SH5FfLWmBkiOVgm6REPWoMo5xmfOqBZuJzNrpCGw3Ada5zBafTbqzpH88FSPeM3kUpj53 FlEQf3ptafWKClitagrTEz+h5zJk+cE= X-MC-Unique: m847oMWQMl--cnCCdWgbDg-1 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Laurent Vivier Subject: [RFC PATCH 1/6] net: introduce convert_host_port() Date: Mon, 9 May 2022 19:36:13 +0200 Message-Id: <20220509173618.467207-2-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.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: 1652118674984100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Laurent Vivier --- include/qemu/sockets.h | 2 ++ net/net.c | 62 ++++++++++++++++++++++-------------------- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h index 038faa157f59..47194b9732f8 100644 --- a/include/qemu/sockets.h +++ b/include/qemu/sockets.h @@ -47,6 +47,8 @@ void socket_listen_cleanup(int fd, Error **errp); int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp= ); =20 /* Old, ipv4 only bits. Don't use for new code. */ +int convert_host_port(struct sockaddr_in *saddr, const char *host, + const char *port, Error **errp); int parse_host_port(struct sockaddr_in *saddr, const char *str, Error **errp); int socket_init(void); diff --git a/net/net.c b/net/net.c index a094cf1d2929..58c05c200622 100644 --- a/net/net.c +++ b/net/net.c @@ -66,55 +66,57 @@ static QTAILQ_HEAD(, NetClientState) net_clients; /***********************************************************/ /* network device redirectors */ =20 -int parse_host_port(struct sockaddr_in *saddr, const char *str, - Error **errp) +int convert_host_port(struct sockaddr_in *saddr, const char *host, + const char *port, Error **errp) { - gchar **substrings; struct hostent *he; - const char *addr, *p, *r; - int port, ret =3D 0; + const char *r; + long p; =20 memset(saddr, 0, sizeof(*saddr)); =20 - substrings =3D g_strsplit(str, ":", 2); - if (!substrings || !substrings[0] || !substrings[1]) { - error_setg(errp, "host address '%s' doesn't contain ':' " - "separating host from port", str); - ret =3D -1; - goto out; - } - - addr =3D substrings[0]; - p =3D substrings[1]; - saddr->sin_family =3D AF_INET; - if (addr[0] =3D=3D '\0') { + if (host[0] =3D=3D '\0') { saddr->sin_addr.s_addr =3D 0; } else { - if (qemu_isdigit(addr[0])) { - if (!inet_aton(addr, &saddr->sin_addr)) { + if (qemu_isdigit(host[0])) { + if (!inet_aton(host, &saddr->sin_addr)) { error_setg(errp, "host address '%s' is not a valid " - "IPv4 address", addr); - ret =3D -1; - goto out; + "IPv4 address", host); + return -1; } } else { - he =3D gethostbyname(addr); + he =3D gethostbyname(host); if (he =3D=3D NULL) { - error_setg(errp, "can't resolve host address '%s'", addr); - ret =3D -1; - goto out; + error_setg(errp, "can't resolve host address '%s'", host); + return -1; } saddr->sin_addr =3D *(struct in_addr *)he->h_addr; } } - port =3D strtol(p, (char **)&r, 0); - if (r =3D=3D p) { - error_setg(errp, "port number '%s' is invalid", p); + if (qemu_strtol(port, &r, 0, &p) !=3D 0) { + error_setg(errp, "port number '%s' is invalid", port); + return -1; + } + saddr->sin_port =3D htons(p); + return 0; +} + +int parse_host_port(struct sockaddr_in *saddr, const char *str, + Error **errp) +{ + gchar **substrings; + int ret; + + substrings =3D g_strsplit(str, ":", 2); + if (!substrings || !substrings[0] || !substrings[1]) { + error_setg(errp, "host address '%s' doesn't contain ':' " + "separating host from port", str); ret =3D -1; goto out; } - saddr->sin_port =3D htons(port); + + ret =3D convert_host_port(saddr, substrings[0], substrings[1], errp); =20 out: g_strfreev(substrings); --=20 2.35.3 From nobody Wed May 15 04:04:06 2024 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=1652118085; cv=none; d=zohomail.com; s=zohoarc; b=E87CWjO7cz2iFmx3XO4n7Wvc93lT5C0oYcqu8oCa6iB+WSyBirvnJ5e9XGiVTe8kqd1zfoyXI071w5HZdLvUjywUickHvSJdFKlo8vvO7ADiJk2Yn7Coh7Kv69lAOY5NLCzCC+HEnrlYAlUUWhmcXF0rMfLV+r1kFEr1xcM0PnA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652118085; h=Content-Type: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=9pVggCBV3OVKkoA52Ik1NjlSVuPLUX1uWrVT+/bJuc0=; b=WBH1SubJ9jfcBAaFsQdKcG/F9BpyStwmkYrCWqkqWAwI/wWKQ1RMfQTsdNNrORa9ZS89CcoV72Ls8bvmxKIkx4feKhHogf2Bj0QsVlKnShu4XmPvleEm+35+KB0EfhBDu6a3u8GTmGHc22+pytBknLLsthgKaa67FSHsyq0d45A= 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 1652118085987187.0728598038677; Mon, 9 May 2022 10:41:25 -0700 (PDT) Received: from localhost ([::1]:43428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1no7Ns-0001KP-Ro for importer@patchew.org; Mon, 09 May 2022 13:41:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1no7J8-00071i-2W 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]:39983) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1no7J4-00012K-MG for qemu-devel@nongnu.org; Mon, 09 May 2022 13:36:29 -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-93-M3M5NcS5MPavbS8NfzdYbA-1; Mon, 09 May 2022 13:36:24 -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 E541A3C1902A for ; Mon, 9 May 2022 17:36:23 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.39.194.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B76240CF8EC; Mon, 9 May 2022 17:36:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652117785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9pVggCBV3OVKkoA52Ik1NjlSVuPLUX1uWrVT+/bJuc0=; b=hb7aLJ+9uvoBLyCj+h2mxjIwuMjMy90Jr/sDD0Nc36502XC44Nf32e1A87ZX+iW0WwVKjp OSSeKGuf6CBIFB03r5lcZjZ2g98c86PNrEWwAuZmzcHPvzwNoDYem+Pk9K2Uo2a7y7h62m 4NgAK6OcmslC2SpOt3nKlAt/M0KCn/c= X-MC-Unique: M3M5NcS5MPavbS8NfzdYbA-1 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Laurent Vivier Subject: [RFC PATCH 2/6] qapi: net: add socket-ng netdev Date: Mon, 9 May 2022 19:36:14 +0200 Message-Id: <20220509173618.467207-3-lvivier@redhat.com> In-Reply-To: <20220509173618.467207-1-lvivier@redhat.com> References: <20220509173618.467207-1-lvivier@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: 1652118088142100001 Copied from socket netdev file and modified to use SocketAddress to be able to introduce new features like unix socket. "udp" and "mcast" are squashed into dgram, multicast is detected according to the IP address type. "listen" and "connect" modes are changed to "server" and "client". As qemu_opts_parse_noisily() flattens the QAPI structures ("type" field of Netdev structure collides with "type" field of SocketAddress), we detect socket-ng backend and use directly visit_type_Netdev() to parse the backend parameters. Signed-off-by: Laurent Vivier net: socket-ng: replace mode=3Dunicast/multicast by mode=3Ddgram The multicast mode is detected according to the remote address type. Signed-off-by: Laurent Vivier --- hmp-commands.hx | 2 +- net/clients.h | 3 + net/hub.c | 1 + net/meson.build | 1 + net/net.c | 61 ++++ net/socket-ng.c | 890 ++++++++++++++++++++++++++++++++++++++++++++++++ qapi/net.json | 41 ++- 7 files changed, 996 insertions(+), 3 deletions(-) create mode 100644 net/socket-ng.c diff --git a/hmp-commands.hx b/hmp-commands.hx index 03e6a73d1f55..74f7c9585ac3 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1269,7 +1269,7 @@ ERST { .name =3D "netdev_add", .args_type =3D "netdev:O", - .params =3D "[user|tap|socket|vde|bridge|hubport|netmap|vhost-= user],id=3Dstr[,prop=3Dvalue][,...]", + .params =3D "[user|tap|socket|socket-ng|vde|bridge|hubport|net= map|vhost-user],id=3Dstr[,prop=3Dvalue][,...]", .help =3D "add host network device", .cmd =3D hmp_netdev_add, .command_completion =3D netdev_add_completion, diff --git a/net/clients.h b/net/clients.h index 92f9b59aedce..8c71a3ba8e97 100644 --- a/net/clients.h +++ b/net/clients.h @@ -40,6 +40,9 @@ int net_init_hubport(const Netdev *netdev, const char *na= me, int net_init_socket(const Netdev *netdev, const char *name, NetClientState *peer, Error **errp); =20 +int net_init_socket_ng(const Netdev *netdev, const char *name, + NetClientState *peer, Error **errp); + int net_init_tap(const Netdev *netdev, const char *name, NetClientState *peer, Error **errp); =20 diff --git a/net/hub.c b/net/hub.c index 1375738bf121..8f9607bfe3dc 100644 --- a/net/hub.c +++ b/net/hub.c @@ -313,6 +313,7 @@ void net_hub_check_clients(void) case NET_CLIENT_DRIVER_USER: case NET_CLIENT_DRIVER_TAP: case NET_CLIENT_DRIVER_SOCKET: + case NET_CLIENT_DRIVER_SOCKET_NG: case NET_CLIENT_DRIVER_VDE: case NET_CLIENT_DRIVER_VHOST_USER: has_host_dev =3D 1; diff --git a/net/meson.build b/net/meson.build index c965e83b264b..92a8cde119d2 100644 --- a/net/meson.build +++ b/net/meson.build @@ -13,6 +13,7 @@ softmmu_ss.add(files( 'net.c', 'queue.c', 'socket.c', + 'socket-ng.c', 'util.c', )) =20 diff --git a/net/net.c b/net/net.c index 58c05c200622..cbc0ff3784b7 100644 --- a/net/net.c +++ b/net/net.c @@ -54,6 +54,7 @@ #include "net/colo-compare.h" #include "net/filter.h" #include "qapi/string-output-visitor.h" +#include "qapi/qobject-input-visitor.h" =20 /* Net bridge is currently not supported for W32. */ #if !defined(_WIN32) @@ -63,6 +64,16 @@ static VMChangeStateEntry *net_change_state_entry; static QTAILQ_HEAD(, NetClientState) net_clients; =20 +typedef struct NetdevQueueEntry { + Netdev *nd; + Location loc; + QSIMPLEQ_ENTRY(NetdevQueueEntry) entry; +} NetdevQueueEntry; + +typedef QSIMPLEQ_HEAD(, NetdevQueueEntry) NetdevQueue; + +static NetdevQueue nd_queue =3D QSIMPLEQ_HEAD_INITIALIZER(nd_queue); + /***********************************************************/ /* network device redirectors */ =20 @@ -1003,6 +1014,7 @@ static int (* const net_client_init_fun[NET_CLIENT_DR= IVER__MAX])( #endif [NET_CLIENT_DRIVER_TAP] =3D net_init_tap, [NET_CLIENT_DRIVER_SOCKET] =3D net_init_socket, + [NET_CLIENT_DRIVER_SOCKET_NG] =3D net_init_socket_ng, #ifdef CONFIG_VDE [NET_CLIENT_DRIVER_VDE] =3D net_init_vde, #endif @@ -1085,6 +1097,7 @@ void show_netdevs(void) int idx; const char *available_netdevs[] =3D { "socket", + "socket-ng", "hubport", "tap", #ifdef CONFIG_SLIRP @@ -1559,6 +1572,19 @@ int net_init_clients(Error **errp) =20 QTAILQ_INIT(&net_clients); =20 + while (!QSIMPLEQ_EMPTY(&nd_queue)) { + NetdevQueueEntry *nd =3D QSIMPLEQ_FIRST(&nd_queue); + + QSIMPLEQ_REMOVE_HEAD(&nd_queue, entry); + loc_push_restore(&nd->loc); + if (net_client_init1(nd->nd, true, errp) < 0) { + return -1; + } + loc_pop(&nd->loc); + qapi_free_Netdev(nd->nd); + g_free(nd); + } + if (qemu_opts_foreach(qemu_find_opts("netdev"), net_init_netdev, NULL, errp)) { return -1; @@ -1575,8 +1601,43 @@ int net_init_clients(Error **errp) return 0; } =20 +static bool netdev_is_socket_ng(const char *optarg) +{ + static QemuOptsList dummy_opts =3D { + .name =3D "netdev", + .implied_opt_name =3D "type", + .head =3D QTAILQ_HEAD_INITIALIZER(dummy_opts.head), + .desc =3D { { } }, + }; + QemuOpts *opts =3D qemu_opts_parse(&dummy_opts, optarg, true, &error_f= atal); + bool is_socket_ng =3D strcmp(qemu_opt_get(opts, "type"), "socket-ng") = =3D=3D 0; + + qemu_opts_reset(&dummy_opts); + + return is_socket_ng; +} + int net_client_parse(QemuOptsList *opts_list, const char *optarg) { + if (netdev_is_socket_ng(optarg)) { + /* + * socket-ng must accept new style object SocketAddress + * like addr.type=3Dinet, ... + */ + Visitor *v; + NetdevQueueEntry *nd; + + v =3D qobject_input_visitor_new_str(optarg, "type", + &error_fatal); + nd =3D g_new(NetdevQueueEntry, 1); + visit_type_Netdev(v, NULL, &nd->nd, &error_fatal); + visit_free(v); + loc_save(&nd->loc); + + QSIMPLEQ_INSERT_TAIL(&nd_queue, nd, entry); + return 0; + } + if (!qemu_opts_parse_noisily(opts_list, optarg, true)) { return -1; } diff --git a/net/socket-ng.c b/net/socket-ng.c new file mode 100644 index 000000000000..0876a4930389 --- /dev/null +++ b/net/socket-ng.c @@ -0,0 +1,890 @@ +/* + * QEMU System Emulator + * + * Copyright (c) 2003-2008 Fabrice Bellard + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + */ +#include "qemu/osdep.h" + +#include "net/net.h" +#include "clients.h" +#include "monitor/monitor.h" +#include "qapi/error.h" +#include "qemu/error-report.h" +#include "qemu/option.h" +#include "qemu/sockets.h" +#include "qemu/iov.h" +#include "qemu/main-loop.h" +#include "qemu/cutils.h" + +typedef struct NetSocketNGState { + NetClientState nc; + int listen_fd; + 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; + IOHandler *send_fn; /* differs between SOCK_STREAM/SOCK_DGRA= M */ + bool read_poll; /* waiting to receive data? */ + bool write_poll; /* waiting to transmit data? */ +} NetSocketNGState; + +static void net_socket_accept(void *opaque); +static void net_socket_writable(void *opaque); + +static void net_socket_update_fd_handler(NetSocketNGState *s) +{ + qemu_set_fd_handler(s->fd, + s->read_poll ? s->send_fn : NULL, + s->write_poll ? net_socket_writable : NULL, + s); +} + +static void net_socket_read_poll(NetSocketNGState *s, bool enable) +{ + s->read_poll =3D enable; + net_socket_update_fd_handler(s); +} + +static void net_socket_write_poll(NetSocketNGState *s, bool enable) +{ + s->write_poll =3D enable; + net_socket_update_fd_handler(s); +} + +static void net_socket_writable(void *opaque) +{ + NetSocketNGState *s =3D opaque; + + net_socket_write_poll(s, false); + + qemu_flush_queued_packets(&s->nc); +} + +static ssize_t net_socket_receive(NetClientState *nc, const uint8_t *buf, + size_t size) +{ + NetSocketNGState *s =3D DO_UPCAST(NetSocketNGState, nc, nc); + uint32_t len =3D htonl(size); + struct iovec iov[] =3D { + { + .iov_base =3D &len, + .iov_len =3D sizeof(len), + }, { + .iov_base =3D (void *)buf, + .iov_len =3D size, + }, + }; + size_t remaining; + ssize_t ret; + + remaining =3D iov_size(iov, 2) - s->send_index; + ret =3D iov_send(s->fd, iov, 2, s->send_index, remaining); + + if (ret =3D=3D -1 && errno =3D=3D EAGAIN) { + ret =3D 0; /* handled further down */ + } + if (ret =3D=3D -1) { + s->send_index =3D 0; + return -errno; + } + if (ret < (ssize_t)remaining) { + s->send_index +=3D ret; + net_socket_write_poll(s, true); + return 0; + } + s->send_index =3D 0; + return size; +} + +static ssize_t net_socket_receive_dgram(NetClientState *nc, + const uint8_t *buf, size_t size) +{ + NetSocketNGState *s =3D DO_UPCAST(NetSocketNGState, nc, nc); + ssize_t ret; + + 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)); + } else { + ret =3D send(s->fd, buf, size, 0); + } + } while (ret =3D=3D -1 && errno =3D=3D EINTR); + + if (ret =3D=3D -1 && errno =3D=3D EAGAIN) { + net_socket_write_poll(s, true); + return 0; + } + return ret; +} + +static void net_socket_send_completed(NetClientState *nc, ssize_t len) +{ + NetSocketNGState *s =3D DO_UPCAST(NetSocketNGState, nc, nc); + + if (!s->read_poll) { + net_socket_read_poll(s, true); + } +} + +static void net_socket_rs_finalize(SocketReadState *rs) +{ + NetSocketNGState *s =3D container_of(rs, NetSocketNGState, rs); + + if (qemu_send_packet_async(&s->nc, rs->buf, + rs->packet_len, + net_socket_send_completed) =3D=3D 0) { + net_socket_read_poll(s, false); + } +} + +static void net_socket_send(void *opaque) +{ + NetSocketNGState *s =3D opaque; + int size; + int ret; + uint8_t buf1[NET_BUFSIZE]; + const uint8_t *buf; + + size =3D recv(s->fd, buf1, sizeof(buf1), 0); + if (size < 0) { + if (errno !=3D EWOULDBLOCK) { + goto eoc; + } + } else if (size =3D=3D 0) { + /* end of connection */ + eoc: + net_socket_read_poll(s, false); + net_socket_write_poll(s, false); + if (s->listen_fd !=3D -1) { + qemu_set_fd_handler(s->listen_fd, net_socket_accept, NULL, s); + } + closesocket(s->fd); + + s->fd =3D -1; + net_socket_rs_init(&s->rs, net_socket_rs_finalize, false); + s->nc.link_down =3D true; + memset(s->nc.info_str, 0, sizeof(s->nc.info_str)); + + return; + } + buf =3D buf1; + + ret =3D net_fill_rstate(&s->rs, buf, size); + + if (ret =3D=3D -1) { + goto eoc; + } +} + +static void net_socket_send_dgram(void *opaque) +{ + NetSocketNGState *s =3D opaque; + int size; + + size =3D recv(s->fd, s->rs.buf, sizeof(s->rs.buf), 0); + if (size < 0) { + return; + } + if (size =3D=3D 0) { + /* end of connection */ + net_socket_read_poll(s, false); + net_socket_write_poll(s, false); + return; + } + if (qemu_send_packet_async(&s->nc, s->rs.buf, size, + net_socket_send_completed) =3D=3D 0) { + net_socket_read_poll(s, false); + } +} + +static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, + struct in_addr *localaddr, + Error **errp) +{ + struct ip_mreq imr; + int fd; + int val, ret; +#ifdef __OpenBSD__ + unsigned char loop; +#else + int loop; +#endif + + if (!IN_MULTICAST(ntohl(mcastaddr->sin_addr.s_addr))) { + error_setg(errp, "specified mcastaddr %s (0x%08x) " + "does not contain a multicast address", + inet_ntoa(mcastaddr->sin_addr), + (int)ntohl(mcastaddr->sin_addr.s_addr)); + return -1; + } + + fd =3D qemu_socket(PF_INET, SOCK_DGRAM, 0); + if (fd < 0) { + error_setg_errno(errp, errno, "can't create datagram socket"); + return -1; + } + + /* + * Allow multiple sockets to bind the same multicast ip and port by se= tting + * SO_REUSEADDR. This is the only situation where SO_REUSEADDR should = be set + * on windows. Use socket_set_fast_reuse otherwise as it sets SO_REUSE= ADDR + * only on posix systems. + */ + val =3D 1; + ret =3D setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)); + if (ret < 0) { + error_setg_errno(errp, errno, + "can't set socket option SO_REUSEADDR"); + goto fail; + } + + ret =3D bind(fd, (struct sockaddr *)mcastaddr, sizeof(*mcastaddr)); + if (ret < 0) { + error_setg_errno(errp, errno, "can't bind ip=3D%s to socket", + inet_ntoa(mcastaddr->sin_addr)); + goto fail; + } + + /* Add host to multicast group */ + imr.imr_multiaddr =3D mcastaddr->sin_addr; + if (localaddr) { + imr.imr_interface =3D *localaddr; + } else { + imr.imr_interface.s_addr =3D htonl(INADDR_ANY); + } + + ret =3D setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, + &imr, sizeof(struct ip_mreq)); + if (ret < 0) { + error_setg_errno(errp, errno, + "can't add socket to multicast group %s", + inet_ntoa(imr.imr_multiaddr)); + goto fail; + } + + /* Force mcast msgs to loopback (eg. several QEMUs in same host */ + loop =3D 1; + ret =3D setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP, + &loop, sizeof(loop)); + if (ret < 0) { + error_setg_errno(errp, errno, + "can't force multicast message to loopback"); + goto fail; + } + + /* If a bind address is given, only send packets from that address */ + if (localaddr !=3D NULL) { + ret =3D setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF, + localaddr, sizeof(*localaddr)); + if (ret < 0) { + error_setg_errno(errp, errno, + "can't set the default network send interface= "); + goto fail; + } + } + + qemu_socket_set_nonblock(fd); + return fd; +fail: + if (fd >=3D 0) { + closesocket(fd); + } + return -1; +} + +static void net_socket_cleanup(NetClientState *nc) +{ + NetSocketNGState *s =3D DO_UPCAST(NetSocketNGState, nc, nc); + if (s->fd !=3D -1) { + net_socket_read_poll(s, false); + net_socket_write_poll(s, false); + close(s->fd); + s->fd =3D -1; + } + if (s->listen_fd !=3D -1) { + qemu_set_fd_handler(s->listen_fd, NULL, NULL, NULL); + closesocket(s->listen_fd); + s->listen_fd =3D -1; + } +} + +static NetClientInfo net_dgram_socket_info =3D { + .type =3D NET_CLIENT_DRIVER_SOCKET_NG, + .size =3D sizeof(NetSocketNGState), + .receive =3D net_socket_receive_dgram, + .cleanup =3D net_socket_cleanup, +}; + +static NetSocketNGState *net_socket_fd_init_dgram(NetClientState *peer, + const char *model, + const char *name, + int fd, int is_fd, + SocketAddress *mcast, + Error **errp) +{ + struct sockaddr_in saddr; + int newfd; + NetClientState *nc; + NetSocketNGState *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) { + 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_socket_mcast_create(&saddr, NULL, errp); + if (newfd < 0) { + goto err; + } + /* clone newfd to fd, close newfd */ + dup2(newfd, fd); + close(newfd); + + } + + nc =3D qemu_new_net_client(&net_dgram_socket_info, peer, model, name); + + s =3D DO_UPCAST(NetSocketNGState, nc, nc); + + s->fd =3D fd; + s->listen_fd =3D -1; + s->send_fn =3D net_socket_send_dgram; + net_socket_rs_init(&s->rs, net_socket_rs_finalize, false); + net_socket_read_poll(s, true); + + /* mcast: save bound address as dst */ + if (is_fd && mcast !=3D NULL) { + s->dgram_dst =3D 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)); + } 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)); + } + + return s; + +err: + closesocket(fd); + return NULL; +} + +static void net_socket_connect(void *opaque) +{ + NetSocketNGState *s =3D opaque; + s->send_fn =3D net_socket_send; + net_socket_read_poll(s, true); +} + +static NetClientInfo net_socket_info =3D { + .type =3D NET_CLIENT_DRIVER_SOCKET_NG, + .size =3D sizeof(NetSocketNGState), + .receive =3D net_socket_receive, + .cleanup =3D net_socket_cleanup, +}; + +static NetSocketNGState *net_socket_fd_init_stream(NetClientState *peer, + const char *model, + const char *name, + int fd, int is_connected) +{ + NetClientState *nc; + NetSocketNGState *s; + + nc =3D qemu_new_net_client(&net_socket_info, peer, model, name); + + snprintf(nc->info_str, sizeof(nc->info_str), "socket-ng: fd=3D%d", fd); + + s =3D DO_UPCAST(NetSocketNGState, nc, nc); + + s->fd =3D fd; + s->listen_fd =3D -1; + net_socket_rs_init(&s->rs, net_socket_rs_finalize, false); + + /* Disable Nagle algorithm on TCP sockets to reduce latency */ + socket_set_nodelay(fd); + + if (is_connected) { + net_socket_connect(s); + } else { + qemu_set_fd_handler(s->fd, NULL, net_socket_connect, s); + } + return s; +} + +static void net_socket_accept(void *opaque) +{ + NetSocketNGState *s =3D opaque; + struct sockaddr_in saddr; + socklen_t len; + int fd; + + for (;;) { + len =3D sizeof(saddr); + fd =3D qemu_accept(s->listen_fd, (struct sockaddr *)&saddr, &len); + if (fd < 0 && errno !=3D EINTR) { + return; + } else if (fd >=3D 0) { + qemu_set_fd_handler(s->listen_fd, NULL, NULL, NULL); + break; + } + } + + s->fd =3D fd; + s->nc.link_down =3D false; + net_socket_connect(s); + snprintf(s->nc.info_str, sizeof(s->nc.info_str), + "socket-ng: connection from %s:%d", + inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port)); +} + +static int net_socketng_listen_init(NetClientState *peer, + const char *model, + const char *name, + SocketAddress *addr, + Error **errp) +{ + NetClientState *nc; + NetSocketNGState *s; + int fd, ret; + + switch (addr->type) { + case SOCKET_ADDRESS_TYPE_INET: { + struct sockaddr_in saddr_in; + + if (convert_host_port(&saddr_in, addr->u.inet.host, addr->u.inet.p= ort, + errp) < 0) { + return -1; + } + + fd =3D qemu_socket(PF_INET, SOCK_STREAM, 0); + if (fd < 0) { + error_setg_errno(errp, errno, "can't create stream socket"); + return -1; + } + qemu_socket_set_nonblock(fd); + + socket_set_fast_reuse(fd); + + ret =3D bind(fd, (struct sockaddr *)&saddr_in, sizeof(saddr_in)); + if (ret < 0) { + error_setg_errno(errp, errno, "can't bind ip=3D%s to socket", + inet_ntoa(saddr_in.sin_addr)); + closesocket(fd); + return -1; + } + break; + } + case SOCKET_ADDRESS_TYPE_UNIX: { + error_setg(errp, "only support inet type"); + return -1; + } + case SOCKET_ADDRESS_TYPE_FD: + fd =3D monitor_fd_param(monitor_cur(), addr->u.fd.str, errp); + if (fd =3D=3D -1) { + return -1; + } + ret =3D qemu_socket_try_set_nonblock(fd); + if (ret < 0) { + error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d= ", + name, fd); + return -1; + } + break; + default: + g_assert_not_reached(); + } + + ret =3D listen(fd, 0); + if (ret < 0) { + error_setg_errno(errp, errno, "can't listen on socket"); + closesocket(fd); + return -1; + } + + nc =3D qemu_new_net_client(&net_socket_info, peer, model, name); + s =3D DO_UPCAST(NetSocketNGState, nc, nc); + s->fd =3D -1; + s->listen_fd =3D fd; + s->nc.link_down =3D true; + net_socket_rs_init(&s->rs, net_socket_rs_finalize, false); + + qemu_set_fd_handler(s->listen_fd, net_socket_accept, NULL, s); + return 0; +} + +static int net_socketng_connect_init(NetClientState *peer, + const char *model, + const char *name, + SocketAddress *addr, + Error **errp) +{ + NetSocketNGState *s; + int fd, connected, ret; + gchar *info_str; + + switch (addr->type) { + case SOCKET_ADDRESS_TYPE_INET: { + struct sockaddr_in saddr_in; + + if (convert_host_port(&saddr_in, addr->u.inet.host, addr->u.inet.p= ort, + errp) < 0) { + return -1; + } + + fd =3D qemu_socket(PF_INET, 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_in, sizeof(saddr= _in)); + if (ret < 0) { + if (errno =3D=3D EINTR || errno =3D=3D EWOULDBLOCK) { + /* continue */ + } else if (errno =3D=3D EINPROGRESS || + errno =3D=3D EALREADY || + errno =3D=3D EINVAL) { + 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("socket-ng: connect to %s:%d", + inet_ntoa(saddr_in.sin_addr), + ntohs(saddr_in.sin_port)); + break; + } + case SOCKET_ADDRESS_TYPE_FD: + fd =3D monitor_fd_param(monitor_cur(), addr->u.fd.str, errp); + if (fd =3D=3D -1) { + return -1; + } + ret =3D qemu_socket_try_set_nonblock(fd); + if (ret < 0) { + error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d= ", + name, fd); + return -1; + } + connected =3D 1; + info_str =3D g_strdup_printf("socket-ng: connect to fd %d", fd); + break; + default: + error_setg(errp, "only support inet or fd type"); + return -1; + } + + s =3D net_socket_fd_init_stream(peer, model, name, fd, connected); + + pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), info_str); + g_free(info_str); + + return 0; +} + +static int net_socketng_mcast_init(NetClientState *peer, + const char *model, + const char *name, + SocketAddress *remote, + SocketAddress *local, + Error **errp) +{ + NetSocketNGState *s; + int fd, ret; + struct sockaddr_in saddr; + + if (remote->type !=3D SOCKET_ADDRESS_TYPE_INET) { + error_setg(errp, "multicast only support inet type"); + return -1; + } + + if (convert_host_port(&saddr, remote->u.inet.host, remote->u.inet.port, + errp) < 0) { + return -1; + } + + if (!local) { + fd =3D net_socket_mcast_create(&saddr, NULL, errp); + if (fd < 0) { + return -1; + } + } else { + switch (local->type) { + case SOCKET_ADDRESS_TYPE_INET: { + struct in_addr localaddr; + + if (inet_aton(local->u.inet.host, &localaddr) =3D=3D 0) { + error_setg(errp, "localaddr '%s' is not a valid IPv4 addre= ss", + local->u.inet.host); + return -1; + } + + fd =3D net_socket_mcast_create(&saddr, &localaddr, errp); + if (fd < 0) { + return -1; + } + break; + } + case SOCKET_ADDRESS_TYPE_FD: + fd =3D monitor_fd_param(monitor_cur(), local->u.fd.str, errp); + if (fd =3D=3D -1) { + return -1; + } + ret =3D qemu_socket_try_set_nonblock(fd); + if (ret < 0) { + error_setg_errno(errp, -ret, "%s: Can't use file descripto= r %d", + name, fd); + return -1; + } + break; + default: + error_setg(errp, "only support inet or fd type for local"); + return -1; + } + } + + s =3D net_socket_fd_init_dgram(peer, model, name, fd, + local->type =3D=3D SOCKET_ADDRESS_TYPE_FD, + remote, errp); + if (!s) { + return -1; + } + + s->dgram_dst =3D saddr; + + 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)); + return 0; + +} + +static int net_socketng_udp_init(NetClientState *peer, + const char *model, + const char *name, + SocketAddress *remote, + SocketAddress *local, + Error **errp) +{ + NetSocketNGState *s; + int fd, ret; + struct sockaddr_in raddr_in; + gchar *info_str; + + if (remote) { + if (local->type =3D=3D SOCKET_ADDRESS_TYPE_FD) { + error_setg(errp, "don't set remote with local.fd"); + return -1; + } + if (remote->type !=3D local->type) { + error_setg(errp, "remote and local types must be the same"); + return -1; + } + } else { + if (local->type !=3D SOCKET_ADDRESS_TYPE_FD) { + error_setg(errp, "type=3Dinet and mode=3Dunicast require " + "remote parameter"); + return -1; + } + } + + switch (local->type) { + case SOCKET_ADDRESS_TYPE_INET: { + struct sockaddr_in laddr_in; + + if (convert_host_port(&laddr_in, local->u.inet.host, local->u.inet= .port, + errp) < 0) { + return -1; + } + + if (convert_host_port(&raddr_in, remote->u.inet.host, + remote->u.inet.port, errp) < 0) { + return -1; + } + + fd =3D qemu_socket(PF_INET, SOCK_DGRAM, 0); + if (fd < 0) { + error_setg_errno(errp, errno, "can't create datagram socket"); + return -1; + } + + ret =3D socket_set_fast_reuse(fd); + if (ret < 0) { + error_setg_errno(errp, errno, + "can't set socket option SO_REUSEADDR"); + closesocket(fd); + return -1; + } + ret =3D bind(fd, (struct sockaddr *)&laddr_in, sizeof(laddr_in)); + if (ret < 0) { + error_setg_errno(errp, errno, "can't bind ip=3D%s to socket", + inet_ntoa(laddr_in.sin_addr)); + closesocket(fd); + return -1; + } + qemu_socket_set_nonblock(fd); + + 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)); + + break; + } + case SOCKET_ADDRESS_TYPE_FD: + fd =3D monitor_fd_param(monitor_cur(), local->u.fd.str, errp); + if (fd =3D=3D -1) { + return -1; + } + ret =3D qemu_socket_try_set_nonblock(fd); + if (ret < 0) { + error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d= ", + name, fd); + return -1; + } + break; + default: + error_setg(errp, "only support inet or fd type for local"); + return -1; + } + + s =3D net_socket_fd_init_dgram(peer, model, name, fd, 0, NULL, errp); + if (!s) { + return -1; + } + + if (remote) { + s->dgram_dst =3D raddr_in; + + pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), info_str); + g_free(info_str); + } + return 0; +} + +static int net_socketng_dgram_init(NetClientState *peer, + const char *model, + const char *name, + SocketAddress *remote, + SocketAddress *local, + Error **errp) +{ + /* detect multicast address */ + if (remote && remote->type =3D=3D SOCKET_ADDRESS_TYPE_INET) { + struct sockaddr_in mcastaddr; + + if (convert_host_port(&mcastaddr, remote->u.inet.host, + remote->u.inet.port, errp) < 0) { + return -1; + } + + if (IN_MULTICAST(ntohl(mcastaddr.sin_addr.s_addr))) { + return net_socketng_mcast_init(peer, model, name, remote, loca= l, + errp); + } + } + /* unicast address */ + if (!local) { + error_setg(errp, "mode=3Ddgram requires local=3D parameter"); + return -1; + } + return net_socketng_udp_init(peer, model, name, remote, local, errp); +} + +int net_init_socket_ng(const Netdev *netdev, const char *name, + NetClientState *peer, Error **errp) +{ + const NetdevSocketNGOptions *sock; + + assert(netdev->type =3D=3D NET_CLIENT_DRIVER_SOCKET_NG); + sock =3D &netdev->u.socket_ng; + + switch (sock->mode) { + case NETDEV_SOCKETNG_MODE_DGRAM: + return net_socketng_dgram_init(peer, "socket", name, sock->remote, + sock->local, errp); + case NETDEV_SOCKETNG_MODE_SERVER: + if (!sock->has_addr) { + error_setg(errp, "mode=3Dserver requires addr parameter"); + return -1; + } + if (sock->has_remote || sock->has_local) { + error_setg(errp, + "local and remote parameters cannot be used with mode=3Ds= erver"); + return -1; + } + return net_socketng_listen_init(peer, "socket", name, sock->addr, = errp); + case NETDEV_SOCKETNG_MODE_CLIENT: + if (!sock->has_addr) { + error_setg(errp, "mode=3Dclient requires addr parameter"); + return -1; + } + if (sock->has_remote || sock->has_local) { + error_setg(errp, + "local and remote parameters cannot be used with mode=3Dc= lient"); + return -1; + } + return net_socketng_connect_init(peer, "socket", name, sock->addr, + errp); + default: + g_assert_not_reached(); + } + + g_assert_not_reached(); +} diff --git a/qapi/net.json b/qapi/net.json index b92f3f5fb444..2b31101e6641 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -7,6 +7,7 @@ ## =20 { 'include': 'common.json' } +{ 'include': 'sockets.json' } =20 ## # @set_link: @@ -452,6 +453,40 @@ '*vhostdev': 'str', '*queues': 'int' } } =20 +## +# @NetdevSocketNGMode: +# +# @dgram: UDP mode +# +# @server: TCP server mode +# +# @client: TCP client mode +# +# Legacy NetdevSocketOptions only accepts one of: +# "fd", "udp", "mcast" and "udp". +# we map: +# "udp", "mcast" -> "dgram" +# "listen" -> "server" +# "connect" -> "client" +# +# Since: 7.1 +# +## +{ 'enum': 'NetdevSocketNGMode', + 'data': [ 'dgram', 'server', 'client' ] } + +## +# @NetdevSocketNGOptions: +# +# Since: 7.1 +## +{ 'struct': 'NetdevSocketNGOptions', + 'data': { + 'mode': 'NetdevSocketNGMode', + '*addr': 'SocketAddress', + '*remote': 'SocketAddress', + '*local': 'SocketAddress' }=C2=A0} + ## # @NetClientDriver: # @@ -463,7 +498,8 @@ ## { 'enum': 'NetClientDriver', 'data': [ 'none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'vde', - 'bridge', 'hubport', 'netmap', 'vhost-user', 'vhost-vdpa' ] } + 'bridge', 'hubport', 'netmap', 'vhost-user', 'vhost-vdpa', + 'socket-ng' ] } =20 ## # @Netdev: @@ -492,7 +528,8 @@ 'hubport': 'NetdevHubPortOptions', 'netmap': 'NetdevNetmapOptions', 'vhost-user': 'NetdevVhostUserOptions', - 'vhost-vdpa': 'NetdevVhostVDPAOptions' } } + 'vhost-vdpa': 'NetdevVhostVDPAOptions', + 'socket-ng': 'NetdevSocketNGOptions' } } =20 ## # @RxState: --=20 2.35.3 From nobody Wed May 15 04:04:06 2024 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=1652118353; cv=none; d=zohomail.com; s=zohoarc; b=YmDFF4I5OErq22L6zMWJ3vKN6CsxXibarlvg9tuDagRaeirsqdMaEZyxvpAxWj7htCbY0OoLcTAUDxS8OeItym4PpzTj4vUj65fANnAsrvT1roF4v0aWhAckEBNUwHETFIbKrSX6y80KeM6s/ewrk0M71hRIoxFCdoFRcViVBbY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652118353; 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=nn3fdLF664pSICyCcQjz5X6rBB1Jo2cBYj86ov0Jg24=; b=Kr4XXKRSaOlgo+UvWhIaqVgy6OoA5+vRXhOa/5nRE0AnzTehFA7NsYoD4pfWuqD9q7m4ru96CIzmcT2xirBJa9N5ad70r4xbKh376XF19En2rcvCwb6bYaXL3RE82DpZ1zUlC28+zAi/uGL562qwlNnSnzNUcaObmU5zRYsZfpE= 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 1652118353421610.2103724008335; Mon, 9 May 2022 10:45:53 -0700 (PDT) Received: from localhost ([::1]:51336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1no7SC-0006nK-F3 for importer@patchew.org; Mon, 09 May 2022 13:45:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1no7J9-00071j-Jw for qemu-devel@nongnu.org; Mon, 09 May 2022 13:36:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:44397) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1no7J5-00012O-FU for qemu-devel@nongnu.org; Mon, 09 May 2022 13:36:29 -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-216-7MLF77PiOQC9dq0m1bH7tw-1; Mon, 09 May 2022 13:36:25 -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 EDA4829AB406 for ; Mon, 9 May 2022 17:36:24 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.39.194.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4826440CFD0C; Mon, 9 May 2022 17:36:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652117786; 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=nn3fdLF664pSICyCcQjz5X6rBB1Jo2cBYj86ov0Jg24=; b=G4Ncyhg/KPB4JcMNGsWKB4o3e9dLaf2A749IVZGVVuhuxwTEeKcfhbXx06YSr9u0AAQ8Og pzrIfkm//P6+JkbhiSBO6YQ5BRZb6DjiZlHzjEOHrTi63tIC/EONxH9jK7KTxdj7wIZzRN L1cDZ5SMXtn+VJ8wAbPyAMbC7caRB9k= X-MC-Unique: 7MLF77PiOQC9dq0m1bH7tw-1 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Laurent Vivier Subject: [RFC PATCH 3/6] net: socket-ng: add unix socket for server and client mode. Date: Mon, 9 May 2022 19:36:15 +0200 Message-Id: <20220509173618.467207-4-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.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: 1652118355291100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Laurent Vivier --- net/socket-ng.c | 109 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 101 insertions(+), 8 deletions(-) diff --git a/net/socket-ng.c b/net/socket-ng.c index 0876a4930389..2c70440a2b57 100644 --- a/net/socket-ng.c +++ b/net/socket-ng.c @@ -382,7 +382,6 @@ static NetSocketNGState *net_socket_fd_init_dgram(NetCl= ientState *peer, /* 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); @@ -463,7 +462,7 @@ static NetSocketNGState *net_socket_fd_init_stream(NetC= lientState *peer, static void net_socket_accept(void *opaque) { NetSocketNGState *s =3D opaque; - struct sockaddr_in saddr; + struct sockaddr_storage saddr; socklen_t len; int fd; =20 @@ -481,9 +480,27 @@ static void net_socket_accept(void *opaque) s->fd =3D fd; s->nc.link_down =3D false; net_socket_connect(s); - snprintf(s->nc.info_str, sizeof(s->nc.info_str), - "socket-ng: 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), + "socket-ng: 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), + "socket-ng: connect from %s", saddr_un.sun_path); + break; + } + default: + g_assert_not_reached(); + } } =20 static int net_socketng_listen_init(NetClientState *peer, @@ -524,8 +541,40 @@ static int net_socketng_listen_init(NetClientState *pe= er, 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); @@ -612,6 +661,50 @@ static int net_socketng_connect_init(NetClientState *p= eer, 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 || + errno =3D=3D EINVAL) { + 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("socket-ng: 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) { @@ -627,7 +720,7 @@ static int net_socketng_connect_init(NetClientState *pe= er, info_str =3D g_strdup_printf("socket-ng: 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 From nobody Wed May 15 04:04:06 2024 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 From nobody Wed May 15 04:04:06 2024 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=1652118207; cv=none; d=zohomail.com; s=zohoarc; b=T1Qm7+1DRybQ4++LUxt6rpTz2cyglaRcR7hdmdtN3MXDltcvkyIVsIVPwLOAj2JyrCBJUKEeudPLmuY6gd8szJg3b8pGwFZ9nuWJYC8Vp9dfO93ORhhLMnu7XIy+hbbW9IMRhDaz6cj4hQ6f6tCTcB9LGuq0L4Di0ASjzMmK78U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652118207; 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=ToYkKaPbfElTjVmH+wgjLdbp1Kb5B9WCRUFojgbjEX4=; b=kBUq3OGW5CRi0h/4FzZeQbHV4gGdD27RopWmFcxL8z4b6p+v1nUBXi0bYBe2EvvO6/M3c/sW8JxrGd19rnXlF9338PpG+xLNUABzYe7FfLYgwOMckBVp8qzCZA7hf+Ctcq+CRTLn6rTE0+s7gcCtVGx9I6zWk7hbY9zECkIOEB4= 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 1652118207892646.8138242777699; Mon, 9 May 2022 10:43:27 -0700 (PDT) Received: from localhost ([::1]:46404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1no7Pq-0003Ty-Oo for importer@patchew.org; Mon, 09 May 2022 13:43:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1no7J9-000726-Ds for qemu-devel@nongnu.org; Mon, 09 May 2022 13:36:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:42409) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1no7J7-00012d-EE for qemu-devel@nongnu.org; Mon, 09 May 2022 13:36:31 -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-278-jElcsOxHMLu8RXiW2fzV3A-1; Mon, 09 May 2022 13:36:27 -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 4CD0B3831C4C for ; Mon, 9 May 2022 17:36:27 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.39.194.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B31940CFD0C; Mon, 9 May 2022 17:36:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652117788; 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=ToYkKaPbfElTjVmH+wgjLdbp1Kb5B9WCRUFojgbjEX4=; b=ZfLmiLr4GV7ZJ7qpIIVGz5smKgHGV5kbZ2bUyISL89PkTRpYV82g03/0eBTd6wVILlbcrj 4ECY/ZRQoZaaCQPhNM+lFIvLamGFgGEp6skCc3Qg4YFtxR+EK70GUvgPa/bw9UtNJALiYD ELfaeyOUZ92oD4Caj+cJNFD24eLYKJQ= X-MC-Unique: jElcsOxHMLu8RXiW2fzV3A-1 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Laurent Vivier Subject: [RFC PATCH 5/6] net: socket-ng: move mcast specific code from net_socket_fd_init_dgram() Date: Mon, 9 May 2022 19:36:17 +0200 Message-Id: <20220509173618.467207-6-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.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: 1652118208646100001 Content-Type: text/plain; charset="utf-8" It is less complex to manage special cases directly in net_socketng_mcast_init() and net_socketng_udp_init(). Signed-off-by: Laurent Vivier --- net/socket-ng.c | 144 ++++++++++++++++++++++++------------------------ 1 file changed, 73 insertions(+), 71 deletions(-) diff --git a/net/socket-ng.c b/net/socket-ng.c index 0056924dc02b..aabdd0eed381 100644 --- a/net/socket-ng.c +++ b/net/socket-ng.c @@ -340,52 +340,11 @@ static NetClientInfo net_dgram_socket_info =3D { static NetSocketNGState *net_socket_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; NetSocketNGState *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_socket_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 @@ -397,24 +356,7 @@ static NetSocketNGState *net_socket_fd_init_dgram(NetC= lientState *peer, net_socket_rs_init(&s->rs, net_socket_rs_finalize, false); net_socket_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), - "socket-ng: 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), - "socket-ng: fd=3D%d %s", fd, SocketAddressType_str(sa_typ= e)); - } - return s; - -err: - g_free(saddr); - closesocket(fd); - return NULL; } =20 static void net_socket_connect(void *opaque) @@ -743,6 +685,7 @@ static int net_socketng_mcast_init(NetClientState *peer, NetSocketNGState *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"); @@ -762,6 +705,9 @@ static int net_socketng_mcast_init(NetClientState *peer, g_free(saddr); return -1; } + info_str =3D g_strdup_printf("socket-ng: mcast=3D%s:%d", + inet_ntoa(saddr->sin_addr), + ntohs(saddr->sin_port)); } else { switch (local->type) { case SOCKET_ADDRESS_TYPE_INET: { @@ -779,9 +725,14 @@ static int net_socketng_mcast_init(NetClientState *pee= r, g_free(saddr); return -1; } + info_str =3D g_strdup_printf("socket-ng: 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); @@ -794,7 +745,46 @@ static int net_socketng_mcast_init(NetClientState *pee= r, 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_socket_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("socket-ng: 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"); @@ -802,9 +792,7 @@ static int net_socketng_mcast_init(NetClientState *peer, } } =20 - s =3D net_socket_fd_init_dgram(peer, model, name, fd, - local->type =3D=3D SOCKET_ADDRESS_TYPE_FD, - remote, errp); + s =3D net_socket_fd_init_dgram(peer, model, name, fd, errp); if (!s) { g_free(saddr); return -1; @@ -813,9 +801,8 @@ static int net_socketng_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), - "socket-ng: 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 @@ -895,7 +882,10 @@ static int net_socketng_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; @@ -906,23 +896,35 @@ static int net_socketng_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("socket: fd=3D%d %s", fd, + SocketAddressType_str(sa_type)); + } else { + info_str =3D g_strdup_printf("socket: fd=3D%d", fd); + } break; + } default: error_setg(errp, "only support inet or fd type for local"); return -1; } =20 - s =3D net_socket_fd_init_dgram(peer, model, name, fd, 0, NULL, errp); + s =3D net_socket_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.35.3 From nobody Wed May 15 04:04:06 2024 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=1652118511; cv=none; d=zohomail.com; s=zohoarc; b=nmL425VjGk23Zypg92fMYTwLdEzpfuJ2sFwqjIubQX5BZEmLBANBD7yLQwIA/c3ZgJE1mTFQcNaYkMZi/P3JUl0aVzqYy+14yiEbcQelBFtwKmttTWeBpR03atFx1erVU2a4A3uMMBh1XG2vSRxjf4bd7G97PtvUYb6Dtyyr2RY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652118511; 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=WN0XLtgqvXP+5fCjwXrSGWZiyDajcM+5Evox/7Xl5L0=; b=UmBK/0Apg8qOlBVVjzKc/68eYk20fSlKG1TbnG6G+xPRNB7RTAxJfzjwh3GAUA34HYLGWFqNlGrDF3KXMdndvJ+RIKvloI0ZdGkrsl3Y0gUoCKUE+VQDkSJEFRfHDzAyl8fjPwsryZo8s2NShcUkFw5DzR0Bb1pm82wgaBnGnd8= 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 1652118511391727.3677694300922; Mon, 9 May 2022 10:48:31 -0700 (PDT) Received: from localhost ([::1]:56082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1no7Uk-0001fP-Ah for importer@patchew.org; Mon, 09 May 2022 13:48:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1no7JB-00074M-8H for qemu-devel@nongnu.org; Mon, 09 May 2022 13:36:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:45681) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1no7J9-000132-ML for qemu-devel@nongnu.org; Mon, 09 May 2022 13:36:32 -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-347-Skp00dGgOdKuZcAd_BJaqA-1; Mon, 09 May 2022 13:36:28 -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 80E68185A7B2 for ; Mon, 9 May 2022 17:36:28 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.39.194.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id A944840CF8EC; Mon, 9 May 2022 17:36:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652117791; 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=WN0XLtgqvXP+5fCjwXrSGWZiyDajcM+5Evox/7Xl5L0=; b=RdVETL43IBvE78hMYi/9svwObZ9U2cJVC+fj3m7f8XZpyMc+eMi+ojl+fUSJpLpd5xahep Uyg1IIYBci+BVWQ4ioKikxfh0xWc6OerCkWRuF1l8/cC1ie5jOnHoiZSBM4U6CtYxqYeVJ bjM1t7U9lmTgMNEu/T7F5Q2B/UpF6EA= X-MC-Unique: Skp00dGgOdKuZcAd_BJaqA-1 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Laurent Vivier Subject: [RFC PATCH 6/6] net: socket-ng: add unix socket for dgram mode Date: Mon, 9 May 2022 19:36:18 +0200 Message-Id: <20220509173618.467207-7-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: 1652118512109100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Laurent Vivier --- net/socket-ng.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 3 deletions(-) diff --git a/net/socket-ng.c b/net/socket-ng.c index aabdd0eed381..d4457f4bc63b 100644 --- a/net/socket-ng.c +++ b/net/socket-ng.c @@ -123,8 +123,15 @@ static ssize_t net_socket_receive_dgram(NetClientState= *nc, =20 do { if (s->dgram_dst) { - ret =3D sendto(s->fd, buf, size, 0, s->dgram_dst, - sizeof(struct sockaddr_in)); + socklen_t len; + + if (s->dgram_dst->sa_family =3D=3D AF_INET) { + len =3D sizeof(struct sockaddr_in); + } else { + len =3D sizeof(struct sockaddr_un); + } + + ret =3D sendto(s->fd, buf, size, 0, s->dgram_dst, len); } else { ret =3D send(s->fd, buf, size, 0); } @@ -831,7 +838,7 @@ static int net_socketng_udp_init(NetClientState *peer, } } else { if (local->type !=3D SOCKET_ADDRESS_TYPE_FD) { - error_setg(errp, "type=3Dinet and mode=3Dunicast require " + error_setg(errp, "type=3Dinet or unix and mode=3Dunicast requi= re " "remote parameter"); return -1; } @@ -882,6 +889,58 @@ static int net_socketng_udp_init(NetClientState *peer, =20 break; } + case SOCKET_ADDRESS_TYPE_UNIX: { + struct sockaddr_un laddr_un, raddr_un; + + ret =3D unlink(local->u.q_unix.path); + if (ret < 0 && errno !=3D ENOENT) { + error_setg_errno(errp, errno, "failed to unlink socket %s", + local->u.q_unix.path); + return -1; + } + + laddr_un.sun_family =3D PF_UNIX; + ret =3D snprintf(laddr_un.sun_path, sizeof(laddr_un.sun_path), "%s= ", + local->u.q_unix.path); + if (ret < 0 || ret >=3D sizeof(laddr_un.sun_path)) { + error_setg(errp, "UNIX socket path '%s' is too long", + local->u.q_unix.path); + error_append_hint(errp, "Path must be less than %zu bytes\n", + sizeof(laddr_un.sun_path)); + } + + raddr_un.sun_family =3D PF_UNIX; + ret =3D snprintf(raddr_un.sun_path, sizeof(raddr_un.sun_path), "%s= ", + remote->u.q_unix.path); + if (ret < 0 || ret >=3D sizeof(raddr_un.sun_path)) { + error_setg(errp, "UNIX socket path '%s' is too long", + remote->u.q_unix.path); + error_append_hint(errp, "Path must be less than %zu bytes\n", + sizeof(raddr_un.sun_path)); + } + + fd =3D qemu_socket(PF_UNIX, SOCK_DGRAM, 0); + if (fd < 0) { + error_setg_errno(errp, errno, "can't create datagram socket"); + return -1; + } + + ret =3D bind(fd, (struct sockaddr *)&laddr_un, sizeof(laddr_un)); + if (ret < 0) { + error_setg_errno(errp, errno, "can't bind unix=3D%s to socket", + laddr_un.sun_path); + closesocket(fd); + return -1; + } + qemu_socket_set_nonblock(fd); + + dgram_dst =3D g_malloc(sizeof(raddr_un)); + memcpy(dgram_dst, &raddr_un, sizeof(raddr_un)); + + info_str =3D g_strdup_printf("socket-ng: udp=3D%s:%s", + laddr_un.sun_path, raddr_un.sun_path); + break; + } case SOCKET_ADDRESS_TYPE_FD: { SocketAddress *sa; SocketAddressType sa_type; --=20 2.35.3