Commit 4a0582f6 authored Feb 11, 2019 by Daniel P. Berrangé Committed by Marc-André Lureau Feb 12, 2019

chardev: forbid 'reconnect' option with server sockets



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 <marcandre.lureau@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20190211182442.8542-5-berrange@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

parent 1645984b

chardev/char-socket.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -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;