[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v2 8/8] net: dgram: add unix socket
From: |
Laurent Vivier |
Subject: |
[RFC PATCH v2 8/8] net: dgram: add unix socket |
Date: |
Thu, 12 May 2022 10:09:32 +0200 |
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
net/dgram.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 62 insertions(+), 3 deletions(-)
diff --git a/net/dgram.c b/net/dgram.c
index c0cf0410792e..9f20bdbc163c 100644
--- a/net/dgram.c
+++ b/net/dgram.c
@@ -85,8 +85,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);
}
@@ -508,7 +515,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;
}
}
@@ -558,6 +565,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.35.3
- [RFC PATCH v2 4/8] net: stream: Don't ignore EINVAL on netdev socket connection, (continued)
- [RFC PATCH v2 4/8] net: stream: Don't ignore EINVAL on netdev socket connection, Laurent Vivier, 2022/05/12
- [RFC PATCH v2 5/8] net: stream: add unix socket, Laurent Vivier, 2022/05/12
- [RFC PATCH v2 3/8] qapi: net: add stream and dgram netdevs, Laurent Vivier, 2022/05/12
- [RFC PATCH v2 6/8] net: dgram: make dgram_dst generic, Laurent Vivier, 2022/05/12
- [RFC PATCH v2 1/8] net: introduce convert_host_port(), Laurent Vivier, 2022/05/12
- [RFC PATCH v2 2/8] qapi: net: introduce a way to bypass qemu_opts_parse_noisily(), Laurent Vivier, 2022/05/12
- [RFC PATCH v2 7/8] net: dgram: move mcast specific code from net_socket_fd_init_dgram(), Laurent Vivier, 2022/05/12
- [RFC PATCH v2 8/8] net: dgram: add unix socket,
Laurent Vivier <=
- Re: [RFC PATCH v2 0/8] qapi: net: add unix socket type support to netdev backend, Stefano Brivio, 2022/05/13