diff options
author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2014-09-08 23:14:23 +0200 |
---|---|---|
committer | Fabiano Fidêncio <fidencio@redhat.com> | 2014-10-10 15:14:18 +0200 |
commit | 3eaecbb3a4d069cde18cb0ad1e93735e0b73ef72 (patch) | |
tree | 7501073ce50d3697f443fc0f9d51204f54156238 /src/virt-viewer-app.c | |
parent | 9886055a4a7e44ee5080fbcbae0b99eeb69ff2d2 (diff) | |
download | virt-viewer-3eaecbb3a4d069cde18cb0ad1e93735e0b73ef72.tar.gz virt-viewer-3eaecbb3a4d069cde18cb0ad1e93735e0b73ef72.tar.xz virt-viewer-3eaecbb3a4d069cde18cb0ad1e93735e0b73ef72.zip |
Use socat instead of nc if possible
It turns out that nc does not leave on server disconnect, and there
doesn't seem to be any option to do that, leaving client open, and
a bunch of idle processes.
Replacing nc with socat solves that, client is disconnected when
the VM is shut down, when the sever connection is closed.
https://bugzilla.redhat.com/show_bug.cgi?id=1030487
Diffstat (limited to 'src/virt-viewer-app.c')
-rw-r--r-- | src/virt-viewer-app.c | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c index f0c378d..525ac70 100644 --- a/src/virt-viewer-app.c +++ b/src/virt-viewer-app.c @@ -626,6 +626,7 @@ virt_viewer_app_open_tunnel_ssh(const char *sshhost, const char *cmd[10]; char portstr[50]; int n = 0; + GString *cat; cmd[n++] = "ssh"; if (sshport) { @@ -638,17 +639,30 @@ virt_viewer_app_open_tunnel_ssh(const char *sshhost, cmd[n++] = sshuser; } cmd[n++] = sshhost; - cmd[n++] = "nc"; - if (port) { - cmd[n++] = host; - cmd[n++] = port; - } else { - cmd[n++] = "-U"; - cmd[n++] = unixsock; - } + + cat = g_string_new("if (command -v socat) >/dev/null 2>&1"); + + g_string_append(cat, "; then socat - "); + if (port) + g_string_append_printf(cat, "TCP:%s:%s", host, port); + else + g_string_append_printf(cat, "UNIX-CONNECT:%s", unixsock); + + g_string_append(cat, "; else nc "); + if (port) + g_string_append_printf(cat, "%s %s", host, port); + else + g_string_append_printf(cat, "-U %s", unixsock); + + g_string_append(cat, "; fi"); + + cmd[n++] = cat->str; cmd[n++] = NULL; - return virt_viewer_app_open_tunnel(cmd); + n = virt_viewer_app_open_tunnel(cmd); + g_string_free(cat, TRUE); + + return n; } static int |