[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/18] chardev: forbid 'reconnect' option with server
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL 04/18] chardev: forbid 'reconnect' option with server sockets |
Date: |
Thu, 7 Feb 2019 17:06:03 +0100 |
From: Daniel P. Berrangé <address@hidden>
The 'reconnect' option is used to give the sleep time, in seconds,
before a client socket attempts to re-establish a connection to the
server. It does not make sense to set this for server sockets, as they
will always accept a new client connection immediately after the
previous one went away.
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Daniel P. Berrangé <address@hidden>
Message-Id: <address@hidden>
---
chardev/char-socket.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index e85250b624..743b7b11cd 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -1035,7 +1035,14 @@ static bool qmp_chardev_validate_socket(ChardevSocket
*sock,
}
/* Validate any options which have a dependancy on client vs server */
- if (!(sock->has_server && sock->server)) {
+ if (!sock->has_server || sock->server) {
+ if (sock->has_reconnect) {
+ error_setg(errp,
+ "'reconnect' option is incompatible with "
+ "socket in server listen mode");
+ return false;
+ }
+ } else {
if (sock->has_websocket && sock->websocket) {
error_setg(errp, "%s", "Websocket client is not implemented");
return false;
--
2.20.1.519.g8feddda32c
- [Qemu-devel] [PULL 00/18] Chardev patches, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 03/18] chardev: fix validation of options for QMP created chardevs, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 06/18] chardev: remove many local variables in qemu_chr_parse_socket, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 07/18] chardev: ensure qemu_chr_parse_compat reports missing driver error, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 04/18] chardev: forbid 'reconnect' option with server sockets,
Marc-André Lureau <=
- [Qemu-devel] [PULL 09/18] chardev: split tcp_chr_wait_connected into two methods, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 10/18] chardev: split up qmp_chardev_open_socket connection code, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 05/18] chardev: forbid 'wait' option with client sockets, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 02/18] io: add qio_task_wait_thread to join with a background thread, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 08/18] chardev: remove unused 'sioc' variable & cleanup paths, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 01/18] io: store reference to thread information in the QIOTask struct, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 11/18] chardev: use a state machine for socket connection state, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 12/18] chardev: honour the reconnect setting in tcp_chr_wait_connected, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 13/18] chardev: disallow TLS/telnet/websocket with tcp_chr_wait_connected, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 14/18] chardev: fix race with client connections in tcp_chr_wait_connected, Marc-André Lureau, 2019/02/07