|
 |
1efd99 |
From b22ebc15e9b2d08663e3105ca12c8cc5de3971ab Mon Sep 17 00:00:00 2001
|
|
|
1efd99 |
From: Pavel Grunt <pgrunt@redhat.com>
|
|
|
1efd99 |
Date: Fri, 7 Apr 2017 12:05:18 +0200
|
|
|
1efd99 |
Subject: [PATCH virt-viewer 32/32] app: Allow to connect to channel using unix
|
|
|
1efd99 |
socket
|
|
|
1efd99 |
To: virt-tools-list@redhat.com
|
|
|
1efd99 |
|
|
|
1efd99 |
Only method for connecting to channel opened later was ssh, however
|
|
|
1efd99 |
this method failes when unix socket is used:
|
|
|
1efd99 |
|
|
|
1efd99 |
<graphics type='spice'>
|
|
|
1efd99 |
<listen type='socket' socket='/tmp/spice.sock'/>
|
|
|
1efd99 |
</graphics>
|
|
|
1efd99 |
|
|
|
1efd99 |
Related: rhbz#1335832, rhbz#1411765
|
|
|
1efd99 |
|
|
|
1efd99 |
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
|
|
|
1efd99 |
(cherry picked from commit fe538a9296925c919d4b80698147e4a1b56ba7fd)
|
|
|
1efd99 |
---
|
|
|
1efd99 |
src/virt-viewer-app.c | 29 +++++++++++++++++++++++------
|
|
|
1efd99 |
1 file changed, 23 insertions(+), 6 deletions(-)
|
|
|
1efd99 |
|
|
|
1efd99 |
diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c
|
|
|
1efd99 |
index 2e7e193..2b74a9f 100644
|
|
|
1efd99 |
--- a/src/virt-viewer-app.c
|
|
|
1efd99 |
+++ b/src/virt-viewer-app.c
|
|
|
1efd99 |
@@ -1129,6 +1129,7 @@ virt_viewer_app_channel_open(VirtViewerSession *session,
|
|
|
1efd99 |
{
|
|
|
1efd99 |
VirtViewerAppPrivate *priv;
|
|
|
1efd99 |
int fd = -1;
|
|
|
1efd99 |
+ gchar *error_message = NULL;
|
|
|
1efd99 |
|
|
|
1efd99 |
g_return_if_fail(self != NULL);
|
|
|
1efd99 |
|
|
|
1efd99 |
@@ -1141,14 +1142,30 @@ virt_viewer_app_channel_open(VirtViewerSession *session,
|
|
|
1efd99 |
if (priv->transport && g_ascii_strcasecmp(priv->transport, "ssh") == 0 &&
|
|
|
1efd99 |
!priv->direct && fd == -1) {
|
|
|
1efd99 |
if ((fd = virt_viewer_app_open_tunnel_ssh(priv->host, priv->port, priv->user,
|
|
|
1efd99 |
- priv->ghost, priv->gport, NULL)) < 0)
|
|
|
1efd99 |
- virt_viewer_app_simple_message_dialog(self, _("Connect to ssh failed."));
|
|
|
1efd99 |
- } else if (fd == -1) {
|
|
|
1efd99 |
- virt_viewer_app_simple_message_dialog(self, _("Can't connect to channel, SSH only supported."));
|
|
|
1efd99 |
+ priv->ghost, priv->gport, priv->unixsock)) < 0) {
|
|
|
1efd99 |
+ error_message = g_strdup(_("Connect to ssh failed."));
|
|
|
1efd99 |
+ g_debug("channel open ssh tunnel: %s", error_message);
|
|
|
1efd99 |
+ }
|
|
|
1efd99 |
+ }
|
|
|
1efd99 |
+ if (fd < 0 && priv->unixsock) {
|
|
|
1efd99 |
+ GError *error = NULL;
|
|
|
1efd99 |
+ if ((fd = virt_viewer_app_open_unix_sock(priv->unixsock, &error)) < 0) {
|
|
|
1efd99 |
+ g_free(error_message);
|
|
|
1efd99 |
+ error_message = g_strdup(error->message);
|
|
|
1efd99 |
+ g_debug("channel open unix socket: %s", error_message);
|
|
|
1efd99 |
+ }
|
|
|
1efd99 |
+ g_clear_error(&error);
|
|
|
1efd99 |
+ }
|
|
|
1efd99 |
+
|
|
|
1efd99 |
+ if (fd < 0) {
|
|
|
1efd99 |
+ virt_viewer_app_simple_message_dialog(self, _("Can't connect to channel: %s"),
|
|
|
1efd99 |
+ (error_message != NULL) ? error_message :
|
|
|
1efd99 |
+ _("only SSH or unix socket connection supported."));
|
|
|
1efd99 |
+ g_free(error_message);
|
|
|
1efd99 |
+ return;
|
|
|
1efd99 |
}
|
|
|
1efd99 |
|
|
|
1efd99 |
- if (fd >= 0)
|
|
|
1efd99 |
- virt_viewer_session_channel_open_fd(session, channel, fd);
|
|
|
1efd99 |
+ virt_viewer_session_channel_open_fd(session, channel, fd);
|
|
|
1efd99 |
}
|
|
|
1efd99 |
#else
|
|
|
1efd99 |
static void
|
|
|
1efd99 |
--
|
|
|
1efd99 |
2.12.2
|
|
|
1efd99 |
|