From 9a72b97768a587fa01f5e3e7578bdd8f94e68afe Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Fri, 19 Mar 2010 14:06:22 +0100
Subject: [PATCH] don't try to resolve wrong streamhost. Fixes #5665
---
src/common/proxy65_manager.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/common/proxy65_manager.py b/src/common/proxy65_manager.py
index dbc848d5e2..5176b460d8 100644
--- a/src/common/proxy65_manager.py
+++ b/src/common/proxy65_manager.py
@@ -83,6 +83,8 @@ class Proxy65Manager:
host = item.getAttr('host')
port = item.getAttr('port')
jid = item.getAttr('jid')
+ if not host or not port or not jid:
+ self.proxies[proxy]._on_connect_failure()
self.proxies[proxy].resolve_result(host, port, jid)
# we can have only one streamhost
raise common.xmpp.NodeProcessed
@@ -113,8 +115,7 @@ class ProxyResolver:
self.host = str(host)
self.port = int(port)
self.jid = unicode(jid)
- self.state = S_RESOLVED
- #FIXME: re-enable proxy testing
+ self.state = S_INITIAL
log.info('start resolving %s:%s' % (self.host, self.port))
self.receiver_tester = ReceiverTester(self.host, self.port, self.jid,
self.sid, self.sender_jid, self._on_receiver_success,
--
GitLab