Fix ssh connection tunneling
Guido Günther
11 years ago
|
0 |
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
|
|
1 |
Date: Mon, 22 Oct 2012 20:05:24 +0200
|
|
2 |
Subject: Fail if opening the connection fails
|
|
3 |
|
|
4 |
instead of returning True. Which then fails with the misleading error
|
|
5 |
|
|
6 |
(virt-viewer:18631): Gtk-WARNING **: Attempting to add a widget with type
|
|
7 |
VncDisplay to a container of type VirtViewerDisplayVnc, but the widget is
|
|
8 |
already inside a container of type VirtViewerDisplayVnc, please use
|
|
9 |
gtk_widget_reparent()
|
|
10 |
---
|
|
11 |
src/virt-viewer.c | 2 +-
|
|
12 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
13 |
|
|
14 |
diff --git a/src/virt-viewer.c b/src/virt-viewer.c
|
|
15 |
index 3143104..572e9e6 100644
|
|
16 |
--- a/src/virt-viewer.c
|
|
17 |
+++ b/src/virt-viewer.c
|
|
18 |
@@ -425,7 +425,7 @@ virt_viewer_open_connection(VirtViewerApp *self G_GNUC_UNUSED, int *fd)
|
|
19 |
DEBUG_LOG("Error %s", err && err->message ? err->message : "Unknown");
|
|
20 |
close(pair[0]);
|
|
21 |
close(pair[1]);
|
|
22 |
- return TRUE;
|
|
23 |
+ return FALSE;
|
|
24 |
}
|
|
25 |
close(pair[0]);
|
|
26 |
*fd = pair[1];
|
|
0 |
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
|
|
1 |
Date: Mon, 22 Oct 2012 21:56:07 +0200
|
|
2 |
Subject: Don't fail early if virDomainOpenGraphics fails
|
|
3 |
|
|
4 |
virt_viewer_app_open_connection invokes virDomainOpenGraphics which only works
|
|
5 |
for local connections. Returning after this failure makes us never reach the
|
|
6 |
ssh part so this unbreaks connections tunneled over ssh.
|
|
7 |
---
|
|
8 |
src/virt-viewer-app.c | 3 +--
|
|
9 |
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
10 |
|
|
11 |
diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c
|
|
12 |
index def52c5..28dc8cb 100644
|
|
13 |
--- a/src/virt-viewer-app.c
|
|
14 |
+++ b/src/virt-viewer-app.c
|
|
15 |
@@ -820,8 +820,7 @@ virt_viewer_app_default_activate(VirtViewerApp *self)
|
|
16 |
VirtViewerAppPrivate *priv = self->priv;
|
|
17 |
int fd = -1;
|
|
18 |
|
|
19 |
- if (!virt_viewer_app_open_connection(self, &fd))
|
|
20 |
- return -1;
|
|
21 |
+ virt_viewer_app_open_connection(self, &fd);
|
|
22 |
|
|
23 |
DEBUG_LOG("After open connection callback fd=%d", fd);
|
|
24 |
|
|
0 |
0001-Fail-if-opening-the-connection-fails.patch
|
|
1 |
0002-Don-t-fail-early-if-virDomainOpenGraphics-fails.patch
|