[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2] qapi: InitSocketAddress: add keepalive option
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH v2] qapi: InitSocketAddress: add keepalive option |
Date: |
Mon, 10 Jun 2019 19:09:57 +0300 |
It's needed to provide keepalive for nbd client to track server
availability.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
v2: [by Markus's comments]
- improve commit message
- s/keepalive/keep-alive
- update inet_parse()
qapi/sockets.json | 5 ++++-
util/qemu-sockets.c | 22 ++++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/qapi/sockets.json b/qapi/sockets.json
index fc81d8d5e8..13a2627e1d 100644
--- a/qapi/sockets.json
+++ b/qapi/sockets.json
@@ -53,6 +53,8 @@
#
# @ipv6: whether to accept IPv6 addresses, default try both IPv4 and IPv6
#
+# @keep-alive: enable keep-alive when connecting to this socket (Since 4.1)
+#
# Since: 1.3
##
{ 'struct': 'InetSocketAddress',
@@ -61,7 +63,8 @@
'*numeric': 'bool',
'*to': 'uint16',
'*ipv4': 'bool',
- '*ipv6': 'bool' } }
+ '*ipv6': 'bool',
+ '*keep-alive': 'bool' } }
##
# @UnixSocketAddress:
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 8850a280a8..9c842c4a93 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -457,6 +457,19 @@ int inet_connect_saddr(InetSocketAddress *saddr, Error
**errp)
}
freeaddrinfo(res);
+
+ if (saddr->keep_alive) {
+ int val = 1;
+ int ret = qemu_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;
+ }
+ }
+
return sock;
}
@@ -652,6 +665,15 @@ int inet_parse(InetSocketAddress *addr, const char *str,
Error **errp)
}
addr->has_ipv6 = true;
}
+ begin = strstr(optstr, ",keep-alive");
+ if (begin) {
+ if (inet_parse_flag("keep-alive", begin + strlen("keep-alive="),
+ &addr->keep_alive, errp) < 0)
+ {
+ return -1;
+ }
+ addr->has_keep_alive = true;
+ }
return 0;
}
--
2.18.0
- [Qemu-devel] [PATCH v2] qapi: InitSocketAddress: add keepalive option,
Vladimir Sementsov-Ogievskiy <=