The branch, master has been updated via ac5b31be15371c87eb335b54df50fe277000d580 (commit) from 5fd75e3eb8928b85866c6ccb97fd9d43c67f1f5e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ac5b31be15371c87eb335b54df50fe277000d580 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Apr 18 16:22:19 2012 +0200 On unused port detection bind to 127.0.0.1 by default. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/proxy/base.py | 2 +- x2go/utils.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fa200d6..2b9f7cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -110,6 +110,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low a previous instance of Python X2Go Client. This trick is nasty, but works around faulty abortion of client implementations. - Handle detection of free TCP/IP X display port far more intelligently. + - On unused port detection bind to 127.0.0.1 by default. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py index c507c55..0c1586c 100644 --- a/x2go/backends/proxy/base.py +++ b/x2go/backends/proxy/base.py @@ -180,7 +180,7 @@ class X2goProxyBASE(threading.Thread): local_graphics_port += 10000 except socket.error: raise x2go_exceptions.X2goControlSessionException('The control session has died unexpectedly.') - local_graphics_port = utils.detect_unused_port(bind_address='', preferred_port=local_graphics_port) + local_graphics_port = utils.detect_unused_port(preferred_port=local_graphics_port) self.fw_tunnel = forward.start_forward_tunnel(local_port=local_graphics_port, remote_port=self.session_info.graphics_port, diff --git a/x2go/utils.py b/x2go/utils.py index e367881..cb8637a 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -354,7 +354,7 @@ def patiently_remove_file(dirname, filename): # file is probably locked gevent.sleep(5) -def detect_unused_port(bind_address='', preferred_port=None): +def detect_unused_port(bind_address='127.0.0.1', preferred_port=None): """\ Detect an unused IP socket. hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).