The branch, master has been updated via 81b1dbb0b4b0689c7170e8e6c6dda89315e99ba7 (commit) from b43c50f7a6d7a9810f7ef5b7d7e5e53bc10f550d (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 81b1dbb0b4b0689c7170e8e6c6dda89315e99ba7 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jun 21 15:24:35 2011 +0200 Assure that rev forwarding tunnels use IPv4 (replace localhost with 127.0.0.1) ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- x2go/backends/terminal/_stdout.py | 6 +++--- x2go/rforward.py | 10 +++++----- 3 files changed, 10 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 46ecd2b..6fd3b8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,9 @@ python-x2go (0.1.1.0-0~x2go1) UNRELEASED; urgency=low - Add X2goSession status property ,,faulty''. - 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) - -- Mike Gabriel <mike@mimino.das-netzwerkteam.de> Tue, 21 Jun 2011 15:07:56 +0200 + -- Mike Gabriel <mike@mimino.das-netzwerkteam.de> Tue, 21 Jun 2011 15:23:49 +0200 python-x2go (0.1.0.3-0~x2go1) unstable; urgency=low diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index cc9d0db..3bd081c 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -388,7 +388,7 @@ class X2goTerminalSessionSTDOUT(object): ### if os.path.exists(os.path.normpath('%s/.pulse-cookie' % _LOCAL_HOME)): # setup pulse client config file on X2go server - cmd_line = "echo 'default-server=localhost:%s'>%s/.pulse-client.conf;" % (self.session_info.snd_port, self.session_info.remote_container) + \ + cmd_line = "echo 'default-server=127.0.0.1:%s'>%s/.pulse-client.conf;" % (self.session_info.snd_port, self.session_info.remote_container) + \ "echo 'cookie-file=%s/.pulse-cookie'>>%s/.pulse-client.conf" % (self.session_info.remote_container, self.session_info.remote_container) (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line) @@ -396,7 +396,7 @@ class X2goTerminalSessionSTDOUT(object): # start reverse SSH tunnel for pulse stream _tunnel = rforward.X2goRevFwTunnel(server_port=self.session_info.snd_port, - remote_host='localhost', + remote_host='127.0.0.1', remote_port=self.snd_port, ssh_transport=self.control_session.get_transport(), session_instance=self.session_instance, @@ -422,7 +422,7 @@ class X2goTerminalSessionSTDOUT(object): # start reverse SSH tunnel for pulse stream _tunnel = rforward.X2goRevFwTunnel(server_port=self.session_info.snd_port, - remote_host='localhost', + remote_host='127.0.0.1', remote_port=self.snd_port, ssh_transport=self.control_session.get_transport(), session_instance=self.session_instance, diff --git a/x2go/rforward.py b/x2go/rforward.py index 6259a83..0388b85 100644 --- a/x2go/rforward.py +++ b/x2go/rforward.py @@ -91,7 +91,7 @@ class X2goRevFwTunnel(threading.Thread): normally some number above 30000 @type server_port: int @param remote_host: the target address for reversely tunneled traffic. With X2go this should - always be set to the localhost address. + always be set to the localhost (IPv4) address. @type remote_host: str @param remote_port: the TCP/IP port on the X2go client (end point of the tunnel), normally an application's standard port (22 for SSH, 4713 for pulse audio, etc.) @@ -246,15 +246,15 @@ class X2goRevFwTunnel(threading.Thread): self.incoming_channel.acquire() - self.logger('waiting for incoming data channel on X2go server port: [localhost]:%s' % self.server_port, loglevel=log.loglevel_DEBUG) + self.logger('waiting for incoming data channel on X2go server port: [127.0.0.1]:%s' % self.server_port, loglevel=log.loglevel_DEBUG) self.incoming_channel.wait() if self._keepalive: - self.logger('detected incoming data channel on X2go server port: [localhost]:%s' % self.server_port, loglevel=log.loglevel_DEBUG) + self.logger('detected incoming data channel on X2go server port: [127.0.0.1]:%s' % self.server_port, loglevel=log.loglevel_DEBUG) _chan = self.ssh_transport.accept() - self.logger('data channel %s for server port [localhost]:%s is up' % (_chan, self.server_port), loglevel=log.loglevel_DEBUG) + self.logger('data channel %s for server port [127.0.0.1]:%s is up' % (_chan, self.server_port), loglevel=log.loglevel_DEBUG) else: - self.logger('closing down rev forwarding tunnel on remote end [localhost]:%s' % self.server_port, loglevel=log.loglevel_DEBUG) + self.logger('closing down rev forwarding tunnel on remote end [127.0.0.1]:%s' % self.server_port, loglevel=log.loglevel_DEBUG) self.incoming_channel.release() if self._accept_channels and self._keepalive: 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).