From: Laurent Vivier <lvivier@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Markus Armbruster" <armbru@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Jason Wang" <jasowang@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Eric Blake" <eblake@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Laurent Vivier" <lvivier@redhat.com>,
"Stefano Brivio" <sbrivio@redhat.com>
Subject: [RFC PATCH v4 09/11] net: dgram: add unix socket
Date: Thu, 23 Jun 2022 17:53:15 +0200 [thread overview]
Message-ID: <20220623155317.675932-10-lvivier@redhat.com> (raw)
In-Reply-To: <20220623155317.675932-1-lvivier@redhat.com>
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
---
net/dgram.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 62 insertions(+), 3 deletions(-)
diff --git a/net/dgram.c b/net/dgram.c
index 16e2d909755c..9f3eafee3b67 100644
--- a/net/dgram.c
+++ b/net/dgram.c
@@ -86,8 +86,15 @@ static ssize_t net_dgram_receive_dgram(NetClientState *nc,
do {
if (s->dgram_dst) {
- ret = sendto(s->fd, buf, size, 0, s->dgram_dst,
- sizeof(struct sockaddr_in));
+ socklen_t len;
+
+ if (s->dgram_dst->sa_family == AF_INET) {
+ len = sizeof(struct sockaddr_in);
+ } else {
+ len = sizeof(struct sockaddr_un);
+ }
+
+ ret = sendto(s->fd, buf, size, 0, s->dgram_dst, len);
} else {
ret = send(s->fd, buf, size, 0);
}
@@ -509,7 +516,7 @@ static int net_dgram_udp_init(NetClientState *peer,
}
} else {
if (local->type != SOCKET_ADDRESS_TYPE_FD) {
- error_setg(errp, "type=inet requires remote parameter");
+ error_setg(errp, "type=inet or unix require remote parameter");
return -1;
}
}
@@ -559,6 +566,58 @@ static int net_dgram_udp_init(NetClientState *peer,
break;
}
+ case SOCKET_ADDRESS_TYPE_UNIX: {
+ struct sockaddr_un laddr_un, raddr_un;
+
+ ret = unlink(local->u.q_unix.path);
+ if (ret < 0 && errno != ENOENT) {
+ error_setg_errno(errp, errno, "failed to unlink socket %s",
+ local->u.q_unix.path);
+ return -1;
+ }
+
+ laddr_un.sun_family = PF_UNIX;
+ ret = snprintf(laddr_un.sun_path, sizeof(laddr_un.sun_path), "%s",
+ local->u.q_unix.path);
+ if (ret < 0 || ret >= 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 = PF_UNIX;
+ ret = snprintf(raddr_un.sun_path, sizeof(raddr_un.sun_path), "%s",
+ remote->u.q_unix.path);
+ if (ret < 0 || ret >= 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 = qemu_socket(PF_UNIX, SOCK_DGRAM, 0);
+ if (fd < 0) {
+ error_setg_errno(errp, errno, "can't create datagram socket");
+ return -1;
+ }
+
+ ret = bind(fd, (struct sockaddr *)&laddr_un, sizeof(laddr_un));
+ if (ret < 0) {
+ error_setg_errno(errp, errno, "can't bind unix=%s to socket",
+ laddr_un.sun_path);
+ closesocket(fd);
+ return -1;
+ }
+ qemu_socket_set_nonblock(fd);
+
+ dgram_dst = g_malloc(sizeof(raddr_un));
+ memcpy(dgram_dst, &raddr_un, sizeof(raddr_un));
+
+ info_str = g_strdup_printf("udp=%s:%s",
+ laddr_un.sun_path, raddr_un.sun_path);
+ break;
+ }
case SOCKET_ADDRESS_TYPE_FD: {
SocketAddress *sa;
SocketAddressType sa_type;
--
2.36.1
next prev parent reply other threads:[~2022-06-23 16:02 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-23 15:53 [RFC PATCH v4 00/11] qapi: net: add unix socket type support to netdev backend Laurent Vivier
2022-06-23 15:53 ` [RFC PATCH v4 01/11] net: introduce convert_host_port() Laurent Vivier
2022-06-23 15:53 ` [RFC PATCH v4 02/11] net: remove the @errp argument of net_client_inits() Laurent Vivier
2022-06-23 15:53 ` [RFC PATCH v4 03/11] qapi: net: introduce a way to bypass qemu_opts_parse_noisily() Laurent Vivier
2022-06-24 8:45 ` Markus Armbruster
2022-06-23 15:53 ` [RFC PATCH v4 04/11] qapi: net: add stream and dgram netdevs Laurent Vivier
2022-06-24 9:41 ` Markus Armbruster
2022-06-27 14:36 ` Laurent Vivier
2022-06-29 11:13 ` Markus Armbruster
2022-06-24 9:53 ` Markus Armbruster
2022-06-23 15:53 ` [RFC PATCH v4 05/11] net: stream: Don't ignore EINVAL on netdev socket connection Laurent Vivier
2022-06-23 15:53 ` [RFC PATCH v4 06/11] net: stream: add unix socket Laurent Vivier
2022-06-23 15:53 ` [RFC PATCH v4 07/11] net: dgram: make dgram_dst generic Laurent Vivier
2022-06-23 15:53 ` [RFC PATCH v4 08/11] net: dgram: move mcast specific code from net_socket_fd_init_dgram() Laurent Vivier
2022-06-23 15:53 ` Laurent Vivier [this message]
2022-06-23 15:53 ` [RFC PATCH v4 10/11] qemu-sockets: introduce socket_uri() Laurent Vivier
2022-06-29 11:26 ` Markus Armbruster
2022-07-01 9:36 ` Laurent Vivier
2022-07-04 5:08 ` Markus Armbruster
2022-06-23 15:53 ` [RFC PATCH v4 11/11] net: stream: move to QIO Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220623155317.675932-10-lvivier@redhat.com \
--to=lvivier@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=jasowang@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=sbrivio@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).