On Tue, Mar 11, 2014 at 6:03 PM, Christophe Fergeau <cfergeau@xxxxxxxxxx> wrote:
> When qemu only accepts TLS connections, but spice-gtk is given an URI with
> both port and tls-port specified, spice_session_channel_open_host() is
> first attempted to the non-TLS port, and when that fails,
> spice_channel_coroutine() retries a TLS connection.
>
On a second thought, I think it was also a good idea to report an
error when the specified non-tls port is invalid.
> Commit 3edcc04 broke this as when the non-TLS connection fails, an error is
> set, and the TLS fallback is no longer attempted.
> This commit fixes this by not reporting an error when we are attempting a
> non-TLS connection, a TLS port is specified, and the non-TLS connection
> failed with G_IO_ERROR_CONNECTION_REFUSED.
> ---
> gtk/spice-session.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/gtk/spice-session.c b/gtk/spice-session.c
> index f217507..9cfb35c 100644
> --- a/gtk/spice-session.c
> +++ b/gtk/spice-session.c
> @@ -1877,7 +1877,15 @@ GSocketConnection* spice_session_channel_open_host(SpiceSession *session, SpiceC
>
> if (open_host.error != NULL) {
> SPICE_DEBUG("open host: %s", open_host.error->message);
> - g_propagate_error(error, open_host.error);
> + if (!*use_tls
> + && s->tls_port
> + && (open_host.error->domain == G_IO_ERROR)
> + && (open_host.error->code == G_IO_ERROR_CONNECTION_REFUSED)) {
> + SPICE_DEBUG("Ignoring open host error, will retry TLS connection");
> + g_clear_error(&open_host.error);
> + } else {
> + g_propagate_error(error, open_host.error);
> + }
> } else if (open_host.connection != NULL) {
> GSocket *socket;
> socket = g_socket_connection_get_socket(open_host.connection);
> --
> 1.8.5.3
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
--
Marc-André Lureau
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel