This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 8747a0154e0d5641759bf88e89b17386eee30f19 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 12 08:49:03 2014 +0200 Use physical host address and port (if provided) for contacting remote broker agent via SSH. --- debian/changelog | 2 ++ x2gobroker/brokers/base_broker.py | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index b773391..d21d8e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -157,6 +157,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low instances or hosts behind a reverse NATed IPv4 gateway). This ended up in a rewrite of the complete selection_session() method of the base broker code. + - Use physical host address and port (if provided) for contacting + remote broker agent via SSH. - Update README and TODO. - Update copyright holders. Copyright is held only by people who actually contributed to the current code base. diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 928550b..d23accd 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -960,6 +960,11 @@ class X2GoBroker(object): remote_agent_server = server_list[-1] remote_agent_port = profile[u'sshport'] + if profile.has_key('host={ras}'.format(ras=remote_agent_server): + remote_agent_server = profile["host={ras}".format(ras=remote_agent_server)] + if profile.has_key('sshport={rap}'.format(ras=remote_agent_port): + remote_agent_port = profile["host={rap}".format(ras=remote_agent_port)] + remote_agent = {u'hostname': remote_agent_server, u'port': remote_agent_port, } try: -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git