87 lines
3.1 KiB
Diff
87 lines
3.1 KiB
Diff
From 644b9e34d8c764598e663eb983e2d6eca4ed2510 Mon Sep 17 00:00:00 2001
|
|
From: Juraj Marcin <jmarcin@redhat.com>
|
|
Date: Wed, 21 May 2025 15:52:33 +0200
|
|
Subject: [PATCH 11/57] util/qemu-sockets: Add support for keep-alive flag to
|
|
passive sockets
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Juraj Marcin <None>
|
|
RH-MergeRequest: 369: util/qemu-sockets: Introduce inet socket options controlling TCP keep-alive
|
|
RH-Jira: RHEL-67104
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Commit: [4/7] a8ec1996262b2bb657b8fe2e72c9045faee0a64c (JurajMarcin/centos-src-qemu-kvm)
|
|
|
|
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>
|
|
|
|
(cherry picked from commit 00064705ed1f3943d3634be25da434466c87e7d5)
|
|
|
|
JIRA: https://issues.redhat.com/browse/RHEL-67104
|
|
|
|
Signed-off-by: Juraj Marcin <jmarcin@redhat.com>
|
|
---
|
|
qapi/sockets.json | 4 ++--
|
|
util/qemu-sockets.c | 9 +++------
|
|
2 files changed, 5 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/qapi/sockets.json b/qapi/sockets.json
|
|
index 6a95023315..62797cd027 100644
|
|
--- a/qapi/sockets.json
|
|
+++ b/qapi/sockets.json
|
|
@@ -56,8 +56,8 @@
|
|
# @ipv6: whether to accept IPv6 addresses, default try both IPv4 and
|
|
# IPv6
|
|
#
|
|
-# @keep-alive: enable keep-alive when connecting to this socket. Not
|
|
-# supported for passive sockets. (Since 4.2)
|
|
+# @keep-alive: enable keep-alive when connecting to/listening on this socket.
|
|
+# (Since 4.2, not supported for listening sockets until 10.1)
|
|
#
|
|
# @mptcp: enable multi-path TCP. (Since 6.1)
|
|
#
|
|
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
|
|
index 631d0c4023..8fc1f86145 100644
|
|
--- a/util/qemu-sockets.c
|
|
+++ b/util/qemu-sockets.c
|
|
@@ -236,12 +236,6 @@ static int inet_listen_saddr(InetSocketAddress *saddr,
|
|
int saved_errno = 0;
|
|
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));
|
|
ai.ai_flags = AI_PASSIVE;
|
|
if (saddr->has_numeric && saddr->numeric) {
|
|
@@ -349,6 +343,9 @@ static int inet_listen_saddr(InetSocketAddress *saddr,
|
|
goto fail;
|
|
}
|
|
/* We have a listening socket */
|
|
+ if (inet_set_sockopts(slisten, saddr, errp) < 0) {
|
|
+ goto fail;
|
|
+ }
|
|
freeaddrinfo(res);
|
|
return slisten;
|
|
}
|
|
--
|
|
2.39.3
|
|
|