[X2go-Commits] python-x2go.git - master (branch) updated: 0.1.1.4-108-ga2ea32c

[X2go dev team]

The branch, master has been updated
       via  a2ea32c9a34eb73ccd4d0c6f08a905f7b17b1548 (commit)
      from  b3bf6d63c5914984585e64d68630e0ac9bced9ec (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 a2ea32c9a34eb73ccd4d0c6f08a905f7b17b1548
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Feb 18 01:59:18 2012 +0100

    New feature, allow/fix sessions on localhost system.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog            |    1 +
 x2go/backends/proxy/base.py |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 7214750..f345262 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
       results to stdout.
     - Handle session titles that just contain blanks (e.g. " ") gracefully.
     - Fix X2Go desktop sharing support.
+    - New feature, allow/fix sessions on localhost system.
   * Depend on python-xlib.
 
  -- Mike Gabriel <mike.gabriel at 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 5efd1a5..fca9720 100644
--- a/x2go/backends/proxy/base.py
+++ b/x2go/backends/proxy/base.py
@@ -178,7 +178,10 @@ class X2goProxyBASE(threading.Thread):
                 pass
 
         local_graphics_port = self.session_info.graphics_port
+        if self.ssh_transport.getpeername() in ('::1', '127.0.0.1', 'localhost', 'localhost.localdomain'):
+            local_graphics_port += 10000
         local_graphics_port = utils.detect_unused_port(bind_address='', preferred_port=local_graphics_port)
+
         self.fw_tunnel = forward.start_forward_tunnel(local_port=local_graphics_port, 
                                                       remote_port=self.session_info.graphics_port, 
                                                       ssh_transport=self.ssh_transport, 


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).