File 5396d3dd-dont-connect-to-localhost-when-using-d... of Package virt-viewer

Overview Repositories Revisions Requests Users Attributes Meta

File 5396d3dd-dont-connect-to-localhost-when-using-direct.patch of Package virt-viewer (Revision a746c94bd382e8dc8201ce343e4f61d0)

Currently displaying revision a746c94bd382e8dc8201ce343e4f61d0 , Show latest

Subject: Don't connect to localhost when using --direct
From: Christophe Fergeau cfergeau@redhat.com Thu Apr 3 14:06:22 2014 +0200
Date: Tue Jun 10 11:46:05 2014 +0200:
Git: e214d6b1d5f3f8b526ebc4f97045d29c1819d0b2

Trying to connect to a remote virtual machine using
virt-viewer -c qemu+ssh://example.com/system --direct $vm_name
will currently fail with an error message saying it's not possible to
localhost. This happens with VMs which listen on a wildcard address (eg
'0.0.0.0').
This was introduced by commit 74b1b62 which changes the host to connect to
to 'localhost' when trying to connect through ssh to a VM listening on a
wildcard address. This is only valid when using a ssh tunnel, and should
not be done with --direct. The fallback code which uses the hostname from
the libvirt URI is what makes the most sense in this situation (wildcard
listen address + --direct).
This commit introduces a virt_viewer_app_get_direct() so that this can be
implemented.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1079211

Index: virt-viewer-0.6.0/src/virt-viewer-app.c
===================================================================
--- virt-viewer-0.6.0.orig/src/virt-viewer-app.c
+++ virt-viewer-0.6.0/src/virt-viewer-app.c
@@ -1835,6 +1835,13 @@ virt_viewer_app_set_direct(VirtViewerApp
     self->priv->direct = direct;
 }
 
+gboolean virt_viewer_app_get_direct(VirtViewerApp *self)
+{
+    g_return_val_if_fail(VIRT_VIEWER_IS_APP(self), FALSE);
+
+    return self->priv->direct;
+}
+
 void
 virt_viewer_app_clear_hotkeys(VirtViewerApp *self)
 {
Index: virt-viewer-0.6.0/src/virt-viewer-app.h
===================================================================
--- virt-viewer-0.6.0.orig/src/virt-viewer-app.h
+++ virt-viewer-0.6.0/src/virt-viewer-app.h
@@ -75,6 +75,7 @@ gboolean virt_viewer_app_activate(VirtVi
 gboolean virt_viewer_app_initial_connect(VirtViewerApp *self, GError **error);
 void virt_viewer_app_start_reconnect_poll(VirtViewerApp *self);
 void virt_viewer_app_set_zoom_level(VirtViewerApp *self, gint zoom_level);
+gboolean virt_viewer_app_get_direct(VirtViewerApp *self);
 void virt_viewer_app_set_direct(VirtViewerApp *self, gboolean direct);
 void virt_viewer_app_set_hotkeys(VirtViewerApp *self, const gchar *hotkeys);
 void virt_viewer_app_set_attach(VirtViewerApp *self, gboolean attach);
Index: virt-viewer-0.6.0/src/virt-viewer.c
===================================================================
--- virt-viewer-0.6.0.orig/src/virt-viewer.c
+++ virt-viewer-0.6.0/src/virt-viewer.c
@@ -365,7 +365,8 @@ virt_viewer_extract_connect_info(VirtVie
      */
     if (virt_viewer_replace_host(ghost)) {
         gchar *replacement_host = NULL;
-        if (g_strcmp0(transport, "ssh") == 0) {
+        if ((g_strcmp0(transport, "ssh") == 0)
+                && !virt_viewer_app_get_direct(app)) {
             replacement_host = g_strdup("localhost");
         } else {
             replacement_host = g_strdup(host);

Places

File 5396d3dd-dont-connect-to-localhost-when-using-direct.patch of Package virt-viewer (Revision a746c94bd382e8dc8201ce343e4f61d0)

Places