[X2Go-Commits] python-x2go.git - release/0.4.0.x (branch) updated: 0.1.0.3-27-g40032c7

X2Go dev team git-admin at x2go.org
Tue Jan 7 16:17:12 CET 2014


The branch, release/0.4.0.x has been updated
       via  40032c72120c5b58f9135488f3120902fce77e7a (commit)
      from  81b1dbb0b4b0689c7170e8e6c6dda89315e99ba7 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog            |    3 ++-
 x2go/backends/proxy/_nx3.py |    6 +++---
 x2go/forward.py             |    6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 6fd3b8f..b34e4bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,9 @@ python-x2go (0.1.1.0-0~x2go1) UNRELEASED; urgency=low
     - Make sure list session and list desktop commands always return.
     - Rely on X2goSessionListInfo backend to handle exceptions appropriately.
     - Assure that rev forwarding tunnels use IPv4 (replace localhost with 127.0.0.1)
+    - Explicitly tunnel over IPv4 for NX proxy.
 
- -- Mike Gabriel <mike at mimino.das-netzwerkteam.de>  Tue, 21 Jun 2011 15:23:49 +0200
+ -- Mike Gabriel <mike at mimino.das-netzwerkteam.de>  Tue, 21 Jun 2011 15:39:08 +0200
 
 python-x2go (0.1.0.3-0~x2go1) unstable; urgency=low
 
diff --git a/x2go/backends/proxy/_nx3.py b/x2go/backends/proxy/_nx3.py
index 38786af..5f1f30f 100644
--- a/x2go/backends/proxy/_nx3.py
+++ b/x2go/backends/proxy/_nx3.py
@@ -80,7 +80,7 @@ class X2goProxyNX3(base.X2goProxyBASE):
                 "nx/nx" ,
                 "retry=5",
                 "composite=1",
-                "connect=localhost",
+                "connect=127.0.0.1",
                 "clipboard=1",
                 "cookie=%s" % self.session_info.cookie,
                 "port=%d" % self.session_info.graphics_port,
@@ -91,7 +91,7 @@ class X2goProxyNX3(base.X2goProxyBASE):
                 "nx/nx" ,
                 "retry=5",
                 "composite=1",
-                "connect=localhost",
+                "connect=127.0.0.1",
                 "clipboard=1",
                 "cookie=%s" % self.session_info.cookie,
                 "port=%d" % self.session_info.graphics_port,
@@ -167,7 +167,7 @@ options=%s""" % ( self.proxy_options['xkbrules'],
 
     def start_proxy(self):
         self.logger('starting local NX3 proxy...', loglevel=log.loglevel_INFO)
-        self.logger('NX3 Proxy mode is server, cookie=%s, host=localhost, port=%s.' % (self.session_info.cookie, self.session_info.graphics_port,), loglevel=log.loglevel_DEBUG)
+        self.logger('NX3 Proxy mode is server, cookie=%s, host=127.0.0.1, port=%s.' % (self.session_info.cookie, self.session_info.graphics_port,), loglevel=log.loglevel_DEBUG)
         self.logger('NX3 proxy writes session log to %s.' % os.path.join(self.session_info.local_container, 'session.log'), loglevel=log.loglevel_DEBUG)
 
         p = base.X2goProxyBASE.start_proxy(self)
diff --git a/x2go/forward.py b/x2go/forward.py
index a1adefe..6786886 100644
--- a/x2go/forward.py
+++ b/x2go/forward.py
@@ -50,7 +50,7 @@ class X2goFwServer(StreamServer):
         """\
         @param listener: listen on TCP/IP socket C{(<IP>, <Port>)}
         @type listener: C{tuple}
-        @param remote_host: hostname or IP of remote host (in case of X2go mostly localhost)
+        @param remote_host: hostname or IP of remote host (in case of X2go mostly 127.0.0.1)
         @type remote_host: C{str}
         @param remote_port: port of remote host
         @type remote_port: C{int}
@@ -143,8 +143,8 @@ class X2goFwServer(StreamServer):
             self.chan.close()
 
 
-def start_forward_tunnel(local_host='localhost', local_port=22022,
-                         remote_host='localhost', remote_port=22,
+def start_forward_tunnel(local_host='127.0.0.1', local_port=22022,
+                         remote_host='127.0.0.1', remote_port=22,
                          ssh_transport=None, 
                          session_instance=None,
                          logger=None, ):


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




More information about the x2go-commits mailing list