| Message ID | 20190115145256.9593-3-berrange@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | chardev: refactoring & many bugfixes related tcp_chr_wait_connected | expand |
On Tue, Jan 15, 2019 at 6:53 PM Daniel P. Berrangé <berrange@redhat.com> wrote: > > 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. > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > 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 6669acb35f..4570755adf 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 >
On 2019-01-15 15:52, Daniel P. Berrangé wrote: > 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. > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > --- > 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 6669acb35f..4570755adf 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; > Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 6669acb35f..4570755adf 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;
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. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- chardev/char-socket.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)