pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2025-12-29 00:15:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ovirt: Take into account SPICE proxy

Browse Source 
VMs managed by oVirt can be hidden behind a proxy. This commit allows
remote-viewer to make use of this information when it's available
A recent oVirt instance is needed so that it's available through the
REST API, as well as libgovirt 0.3.3 or newer.
With older oVirt/libgovirt versions, the worst that can happen is a
runtime warning in the console, and an impossibility to connect to VMs
behind a proxy, so this commit is not raising the minimum libgovirt
requirement.
This commit is contained in:
Christophe Fergeau 2015-01-22 16:45:01 +01:00
parent 21306d13f9
commit f9577b9197
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/remote-viewer.c
View File

@ -828,6 +828,7 @@ create_ovirt_session(VirtViewerApp *app, const char *uri, GError **err)
gboolean success = FALSE;
guint port;
guint secure_port;
char *proxy_url = NULL;
OvirtVmDisplayType type;
const char *session_type;
@ -908,6 +909,7 @@ create_ovirt_session(VirtViewerApp *app, const char *uri, GError **err)
"secure-port", &secure_port,
"ticket", &ticket,
"host-subject", &host_subject,
"proxy-url", &proxy_url,
NULL);
gport = g_strdup_printf("%d", port);
gtlsport = g_strdup_printf("%d", secure_port);
@ -946,6 +948,7 @@ create_ovirt_session(VirtViewerApp *app, const char *uri, GError **err)
g_object_set(G_OBJECT(session),
"password", ticket,
"cert-subject", host_subject,
"proxy", proxy_url,
NULL);
g_object_get(G_OBJECT(proxy), "ca-cert", &ca_cert, NULL);
if (ca_cert != NULL) {
@ -969,6 +972,7 @@ error:
g_free(ghost);
g_free(host_subject);
g_free(guid);
g_free(proxy_url);
if (error != NULL)
g_propagate_error(err, error);