This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository python-x2go. from 39ef6c5 x2go/log.py: Start logging to stdout (rather than stderr). new 8ace8f2 Fix Mac OS recognition new a6d338c Respect NXPROXY_BINARY also on non-Windows systems new 8dc074e Prevent infinite loop in X2GoRevFwTunnel handler The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: x2go/backends/proxy/nx3.py | 2 ++ x2go/defaults.py | 2 +- x2go/rforward.py | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 8ace8f28ce63b822e155edf2be6c8fe5e2fb5ced Author: Tomáš Cerha <t.cerha@gmail.com> Date: Tue Jun 21 12:23:15 2022 +0200 Fix Mac OS recognition platform.system() actually returns 'Darwin' on Mac OS. --- x2go/defaults.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2go/defaults.py b/x2go/defaults.py index 1281c90..8b2b708 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -81,7 +81,7 @@ elif X2GOCLIENT_OS == "Linux": SUPPORTED_MIMEBOX = True SUPPORTED_TELEKINESIS = True -elif X2GOCLIENT_OS == "Mac": +elif X2GOCLIENT_OS == "Darwin": ROOT_DIR = '/' ETC_DIR = os.path.join(ROOT_DIR, 'etc', 'x2goclient') import getpass -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit a6d338cf04bedd736b968fbbb568c399dcbd26ae Author: Tomáš Cerha <t.cerha@gmail.com> Date: Tue Jun 21 12:43:45 2022 +0200 Respect NXPROXY_BINARY also on non-Windows systems --- x2go/backends/proxy/nx3.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x2go/backends/proxy/nx3.py b/x2go/backends/proxy/nx3.py index 03cb66b..5777d0e 100644 --- a/x2go/backends/proxy/nx3.py +++ b/x2go/backends/proxy/nx3.py @@ -66,6 +66,8 @@ class X2GoProxy(base.X2GoProxy): if os.path.exists(_nxproxy_cmd): break self.PROXY_CMD = _nxproxy_cmd + elif 'NXPROXY_BINARY' in os.environ: + self.PROXY_CMD = os.environ['NXPROXY_BINARY'] else: self.PROXY_CMD = "/usr/bin/nxproxy" self.PROXY_ENV.update({ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 8dc074e4a2bf630b14f50c41ce0154cb223b3b9a Author: Tomáš Cerha <t.cerha@gmail.com> Date: Tue Jun 21 14:46:48 2022 +0200 Prevent infinite loop in X2GoRevFwTunnel handler Without this change, we observed a running X2Go session freezing after about 3 hours running on Windows with the following output: WARN: Reverse tunnel <paramiko.Channel 16 (open) window=2036405 -> <paramiko.Transport at 0x4e4f270L (cipher aes128-ctr, 128 bits) (active; 2 open channel(s))>> encoutered socket error: [Errno 10054] An existing connection was forcibly closed by the remote host Breaking after catching 1024 socket errors prevents looping forever. The tunnel is automatically closed, which allows the application to reopen it automatically and recover gracefully from the situation. --- x2go/rforward.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/x2go/rforward.py b/x2go/rforward.py index e60931b..c5eae5d 100644 --- a/x2go/rforward.py +++ b/x2go/rforward.py @@ -330,6 +330,7 @@ def x2go_rev_forward_channel_handler(chan=None, addr='', port=0, parent_thread=N logger('Connected! Reverse tunnel open %r -> %r -> %r' % (chan.origin_addr, chan.getpeername(), (addr, port)), loglevel=log.loglevel_INFO) + n = 0 while parent_thread._accept_channels: r, w, x = select.select([fw_socket, chan], [], []) try: @@ -345,6 +346,9 @@ def x2go_rev_forward_channel_handler(chan=None, addr='', port=0, parent_thread=N fw_socket.send(data) except socket.error as e: logger('Reverse tunnel %s encoutered socket error: %s' % (chan, str(e)), loglevel=log.loglevel_WARN) + n += 1 + if n >= 1024: + break chan.close() fw_socket.close() -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
-
git-admin＠x2go.org