[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 3/6] net: socket-ng: add unix socket for server and client mo
From: |
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 |
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
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(NetClientState *peer,
/* clone newfd to fd, close newfd */
dup2(newfd, fd);
close(newfd);
-
}
nc = qemu_new_net_client(&net_dgram_socket_info, peer, model, name);
@@ -463,7 +462,7 @@ static NetSocketNGState
*net_socket_fd_init_stream(NetClientState *peer,
static void net_socket_accept(void *opaque)
{
NetSocketNGState *s = opaque;
- struct sockaddr_in saddr;
+ struct sockaddr_storage saddr;
socklen_t len;
int fd;
@@ -481,9 +480,27 @@ static void net_socket_accept(void *opaque)
s->fd = fd;
s->nc.link_down = 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 = (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 = 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();
+ }
}
static int net_socketng_listen_init(NetClientState *peer,
@@ -524,8 +541,40 @@ static int net_socketng_listen_init(NetClientState *peer,
break;
}
case SOCKET_ADDRESS_TYPE_UNIX: {
- error_setg(errp, "only support inet type");
- return -1;
+ struct sockaddr_un saddr_un;
+
+ ret = unlink(addr->u.q_unix.path);
+ if (ret < 0 && errno != ENOENT) {
+ error_setg_errno(errp, errno, "failed to unlink socket %s",
+ addr->u.q_unix.path);
+ return -1;
+ }
+
+ saddr_un.sun_family = PF_UNIX;
+ ret = snprintf(saddr_un.sun_path, sizeof(saddr_un.sun_path), "%s",
+ addr->u.q_unix.path);
+ if (ret < 0 || ret >= 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 = 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 = 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 = monitor_fd_param(monitor_cur(), addr->u.fd.str, errp);
@@ -612,6 +661,50 @@ static int net_socketng_connect_init(NetClientState *peer,
ntohs(saddr_in.sin_port));
break;
}
+ case SOCKET_ADDRESS_TYPE_UNIX: {
+ struct sockaddr_un saddr_un;
+
+ saddr_un.sun_family = PF_UNIX;
+ ret = snprintf(saddr_un.sun_path, sizeof(saddr_un.sun_path), "%s",
+ addr->u.q_unix.path);
+ if (ret < 0 || ret >= 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 = 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 = 0;
+ for (;;) {
+ ret = connect(fd, (struct sockaddr *)&saddr_un, sizeof(saddr_un));
+ if (ret < 0) {
+ if (errno == EINTR || errno == EWOULDBLOCK) {
+ /* continue */
+ } else if (errno == EAGAIN ||
+ errno == EALREADY ||
+ errno == EINVAL) {
+ break;
+ } else {
+ error_setg_errno(errp, errno, "can't connect socket");
+ closesocket(fd);
+ return -1;
+ }
+ } else {
+ connected = 1;
+ break;
+ }
+ }
+ info_str = g_strdup_printf("socket-ng: connect to %s",
+ saddr_un.sun_path);
+ break;
+ }
case SOCKET_ADDRESS_TYPE_FD:
fd = monitor_fd_param(monitor_cur(), addr->u.fd.str, errp);
if (fd == -1) {
@@ -627,7 +720,7 @@ static int net_socketng_connect_init(NetClientState *peer,
info_str = 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;
}
--
2.35.3
- [RFC PATCH 0/6] qapi: net: add unix socket type support to netdev backend, Laurent Vivier, 2022/05/09
- [RFC PATCH 4/6] net: socket-ng: make dgram_dst generic, Laurent Vivier, 2022/05/09
- [RFC PATCH 3/6] net: socket-ng: add unix socket for server and client mode.,
Laurent Vivier <=
- [RFC PATCH 2/6] qapi: net: add socket-ng netdev, Laurent Vivier, 2022/05/09
- [RFC PATCH 6/6] net: socket-ng: add unix socket for dgram mode, Laurent Vivier, 2022/05/09
- [RFC PATCH 5/6] net: socket-ng: move mcast specific code from net_socket_fd_init_dgram(), Laurent Vivier, 2022/05/09
- [RFC PATCH 1/6] net: introduce convert_host_port(), Laurent Vivier, 2022/05/09
- Re: [RFC PATCH 0/6] qapi: net: add unix socket type support to netdev backend, Daniel P . Berrangé, 2022/05/10