84 lines
2.6 KiB
Diff
84 lines
2.6 KiB
Diff
From cc7fbd3aabe3be1e2966472a151dc618be02ac4c Mon Sep 17 00:00:00 2001
|
|
From: Juraj Marcin <jmarcin@redhat.com>
|
|
Date: Wed, 21 May 2025 15:52:31 +0200
|
|
Subject: [PATCH 09/57] util/qemu-sockets: Refactor setting client sockopts
|
|
into a separate function
|
|
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: [2/7] b9b258d9a21a31ead1dd4488f1f55f1728fa8b41 (JurajMarcin/centos-src-qemu-kvm)
|
|
|
|
This is done in preparation for enabling the SO_KEEPALIVE support for
|
|
server sockets and adding settings for more TCP keep-alive socket
|
|
options.
|
|
|
|
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 b8b5278aca78be4a1c2e7cbb11c6be176f63706d)
|
|
|
|
JIRA: https://issues.redhat.com/browse/RHEL-67104
|
|
|
|
Signed-off-by: Juraj Marcin <jmarcin@redhat.com>
|
|
---
|
|
util/qemu-sockets.c | 29 +++++++++++++++++++----------
|
|
1 file changed, 19 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
|
|
index 60c44b2b56..2c0e4883ce 100644
|
|
--- a/util/qemu-sockets.c
|
|
+++ b/util/qemu-sockets.c
|
|
@@ -205,6 +205,22 @@ static int try_bind(int socket, InetSocketAddress *saddr, struct addrinfo *e)
|
|
#endif
|
|
}
|
|
|
|
+static int inet_set_sockopts(int sock, InetSocketAddress *saddr, Error **errp)
|
|
+{
|
|
+ if (saddr->keep_alive) {
|
|
+ int keep_alive = 1;
|
|
+ int ret = setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
|
|
+ &keep_alive, sizeof(keep_alive));
|
|
+
|
|
+ if (ret < 0) {
|
|
+ error_setg_errno(errp, errno,
|
|
+ "Unable to set keep-alive option on socket");
|
|
+ return -1;
|
|
+ }
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static int inet_listen_saddr(InetSocketAddress *saddr,
|
|
int port_offset,
|
|
int num,
|
|
@@ -476,16 +492,9 @@ int inet_connect_saddr(InetSocketAddress *saddr, Error **errp)
|
|
return sock;
|
|
}
|
|
|
|
- if (saddr->keep_alive) {
|
|
- int val = 1;
|
|
- int ret = setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
|
|
- &val, sizeof(val));
|
|
-
|
|
- if (ret < 0) {
|
|
- error_setg_errno(errp, errno, "Unable to set KEEPALIVE");
|
|
- close(sock);
|
|
- return -1;
|
|
- }
|
|
+ if (inet_set_sockopts(sock, saddr, errp) < 0) {
|
|
+ close(sock);
|
|
+ return -1;
|
|
}
|
|
|
|
return sock;
|
|
--
|
|
2.39.3
|
|
|