motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 00:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

util/qemu-sockets: Add support for keep-alive flag to passive sockets

Browse source 
Commit aec21d3175 (qapi: Add InetSocketAddress member keep-alive)
introduces the keep-alive flag, which enables the SO_KEEPALIVE socket
option, but only on client-side sockets. However, this option is also
useful for server-side sockets, so they can check if a client is still
reachable or drop the connection otherwise.

This patch enables the SO_KEEPALIVE socket option on passive server-side
sockets if the keep-alive flag is enabled. This socket option is then
inherited by active server-side sockets communicating with connected
clients.

Signed-off-by: Juraj Marcin <jmarcin@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Juraj Marcin 2025-05-21 15:52:33 +02:00 • committed by Daniel P. Berrangé
parent 911e0f2c6e
commit 00064705ed
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
qapi/sockets.json
View file

@ -56,8 +56,8 @@
# @ipv6: whether to accept IPv6 addresses, default try both IPv4 and # @ipv6: whether to accept IPv6 addresses, default try both IPv4 and
# IPv6 # IPv6
# #
# @keep-alive: enable keep-alive when connecting to this socket. Not # @keep-alive: enable keep-alive when connecting to/listening on this socket.
# supported for passive sockets. (Since 4.2) # (Since 4.2, not supported for listening sockets until 10.1)
# #
# @mptcp: enable multi-path TCP. (Since 6.1) # @mptcp: enable multi-path TCP. (Since 6.1)
# #

9
util/qemu-sockets.c
View file

@ -236,12 +236,6 @@ static int inet_listen_saddr(InetSocketAddress *saddr,
int saved_errno = 0; int saved_errno = 0;
bool socket_created = false; bool socket_created = false;
if (saddr->keep_alive) {
error_setg(errp, "keep-alive option is not supported for passive "
"sockets");
return -1;
}
memset(&ai,0, sizeof(ai)); memset(&ai,0, sizeof(ai));
ai.ai_flags = AI_PASSIVE; ai.ai_flags = AI_PASSIVE;
if (saddr->has_numeric && saddr->numeric) { if (saddr->has_numeric && saddr->numeric) {
@ -349,6 +343,9 @@ static int inet_listen_saddr(InetSocketAddress *saddr,
goto fail; goto fail;
} }
/* We have a listening socket */ /* We have a listening socket */
if (inet_set_sockopts(slisten, saddr, errp) < 0) {
goto fail;
}
freeaddrinfo(res); freeaddrinfo(res);
return slisten; return slisten;
} }