diff options
| author | Stefan de Konink <stefan@konink.de> | 2011-01-23 01:47:22 +0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-01-23 02:08:29 +0800 |
| commit | c3be6ea0b2141fe86b9aa0c2701e43b72f86ae30 (patch) | |
| tree | bc9f72845c4db4ed6f0ba8f667fc1f017c744313 | |
| parent | da332365d4e97720ac182e0f66b73919d764a555 (diff) | |
| download | slixmpp-c3be6ea0b2141fe86b9aa0c2701e43b72f86ae30.tar.gz slixmpp-c3be6ea0b2141fe86b9aa0c2701e43b72f86ae30.tar.bz2 slixmpp-c3be6ea0b2141fe86b9aa0c2701e43b72f86ae30.tar.xz slixmpp-c3be6ea0b2141fe86b9aa0c2701e43b72f86ae30.zip | |
My hunch is that these should also be updated.
| -rwxr-xr-x | conn_tests/testpubsub.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/clientxmpp.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/plugins/xep_0078.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/plugins/xep_0199.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/conn_tests/testpubsub.py b/conn_tests/testpubsub.py index 24855c90..3aa7200e 100755 --- a/conn_tests/testpubsub.py +++ b/conn_tests/testpubsub.py @@ -33,7 +33,7 @@ class testps(sleekxmpp.ClientXMPP): self.node = "pstestnode_%s" self.pshost = pshost if pshost is None: - self.pshost = self.server + self.pshost = self.boundjid.host self.nodenum = int(nodenum) self.leafnode = self.nodenum + 1 self.collectnode = self.nodenum + 2 diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py index b8668107..a1813985 100644 --- a/sleekxmpp/clientxmpp.py +++ b/sleekxmpp/clientxmpp.py @@ -164,7 +164,7 @@ class ClientXMPP(BaseXMPP): log.debug("Since no address is supplied," + \ "attempting SRV lookup.") try: - xmpp_srv = "_xmpp-client._tcp.%s" % self.server + xmpp_srv = "_xmpp-client._tcp.%s" % self.boundjid.host answers = dns.resolver.query(xmpp_srv, dns.rdatatype.SRV) except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer): log.debug("No appropriate SRV record found." + \ diff --git a/sleekxmpp/plugins/xep_0078.py b/sleekxmpp/plugins/xep_0078.py index d2c81b16..bb6a4632 100644 --- a/sleekxmpp/plugins/xep_0078.py +++ b/sleekxmpp/plugins/xep_0078.py @@ -36,7 +36,7 @@ class xep_0078(base.base_plugin): log.debug("Starting jabber:iq:auth Authentication") auth_request = self.xmpp.makeIqGet() auth_request_query = ET.Element('{jabber:iq:auth}query') - auth_request.attrib['to'] = self.xmpp.server + auth_request.attrib['to'] = self.xmpp.boundjid.host username = ET.Element('username') username.text = self.xmpp.username auth_request_query.append(username) diff --git a/sleekxmpp/plugins/xep_0199.py b/sleekxmpp/plugins/xep_0199.py index 2e99ae76..16e79e26 100644 --- a/sleekxmpp/plugins/xep_0199.py +++ b/sleekxmpp/plugins/xep_0199.py @@ -33,7 +33,7 @@ class xep_0199(base.base_plugin): def scheduled_ping(self): log.debug("pinging...") - if self.sendPing(self.xmpp.server, self.config.get('timeout', 30)) is False: + if self.sendPing(self.xmpp.boundjid.host, self.config.get('timeout', 30)) is False: log.debug("Did not recieve ping back in time. Requesting Reconnect.") self.xmpp.reconnect() |