[X2Go-Commits] [libx2goclient] 31/44: src/x2goclient-network-ssh.c: change timeout check to 3000 ms (3 seconds) while debugging.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository libx2goclient.

commit 7e61eea51fc5090dd590962e15c0a5bc925eb13e
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Sep 14 06:17:04 2020 +0200

    src/x2goclient-network-ssh.c: change timeout check to 3000 ms (3 seconds) while debugging.
    
    Also, add notes to revert that after debugging and to make it non-static
    at some later time (to account for things like round-trip times if the
    control socket is non-local).
---
 src/x2goclient-network-ssh.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/x2goclient-network-ssh.c b/src/x2goclient-network-ssh.c
index dff177d..40fa0de 100644
--- a/src/x2goclient-network-ssh.c
+++ b/src/x2goclient-network-ssh.c
@@ -1516,7 +1516,22 @@ static gboolean x2goclient_network_ssh_start_check_timeout_real (X2GoClientNetwo
   g_mutex_lock (&(self->check_thread_mutex));
 
   /* Add source. */
-  self->check_timeout_source = g_timeout_source_new (50);
+  /* FIXME: revert back to 50 ms after debugging. */
+  /* FIXME: is a static value the right way to go here?
+   *        Checking if the master connection is still alive every 50 ms is
+   *        fine IFF the connection is local (i.e., a local UNIX socket).
+   *        However, since we want to eventually forward UNIX sockets (one of
+   *        the reasons for using OpenSSH instead of other libraries), a UNIX
+   *        socket might not be local and it's not entirely unthinkable that
+   *        we'll eventually forward even control UNIX sockets.
+   *        In such a case, even though communication with the socket looks
+   *        transparent to everything else, it will still incur round-trip
+   *        times that might exceed our default value of 50 ms, which isn't a
+   *        big problem per se, but wasting CPU and network resources.
+   *        We'd be fine running the check every 5 round trips, so a static
+   *        value is not that great, really.
+   */
+  self->check_timeout_source = g_timeout_source_new (3000);
 
   /* Bind check function to timeout source. */
   g_source_set_callback (self->check_timeout_source, &x2goclient_network_ssh_check_timeout, self, NULL);

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git