mirror of
https://github.com/correl/SleekXMPP.git
synced 2024-12-22 19:17:30 +00:00
70f69c180c
Fixes to both ClientXMPP & xmlstream. ClientXMPP was not tracking the changes to authenticated and sessionstarted after the client was disconnected.
xmlstream had some funkyness with state in the _process method that was cleaned up and hopefully made a little cleaner.
Also changed a DNS issue that was occuring that rendered me unable to disconnect. I would recieve the following error upon reconnect.
Exception in thread process:
Exception in thread process:
Traceback (most recent call last):
File "/usr/local/lib/python2.6/threading.py", line 532, in __bootstrap_inner
self.run()
File "/usr/local/lib/python2.6/threading.py", line 484, in run
self.__target(*self.__args, **self.__kwargs)
File "/home/macdiesel/tmp/workspace/SleekXMPP/sleekxmpp/xmlstream/xmlstream.py", line 202, in _process
self.reconnect()
File "/home/macdiesel/tmp/workspace/SleekXMPP/sleekxmpp/__init__.py", line 134, in reconnect
XMLStream.reconnect(self)
File "/home/macdiesel/tmp/workspace/SleekXMPP/sleekxmpp/xmlstream/xmlstream.py", line 289, in reconnect
self.connect()
File "/home/macdiesel/tmp/workspace/SleekXMPP/sleekxmpp/__init__.py", line 99, in connect
answers = dns.resolver.query("_xmpp-client._tcp.%s" % self.server, "SRV")
File "/usr/local/lib/python2.6/site-packages/dns/resolver.py", line 732, in query
return get_default_resolver().query(qname, rdtype, rdclass, tcp, source)
File "/usr/local/lib/python2.6/site-packages/dns/resolver.py", line 617, in query
source=source)
File "/usr/local/lib/python2.6/site-packages/dns/query.py", line 113, in udp
wire = q.to_wire()
File "/usr/local/lib/python2.6/site-packages/dns/message.py", line 404, in to_wire
r.add_question(rrset.name, rrset.rdtype, rrset.rdclass)
File "/usr/local/lib/python2.6/site-packages/dns/renderer.py", line 152, in add_question
self.output.write(struct.pack("!HH", rdtype, rdclass))
TypeError: unsupported operand type(s) for &: 'unicode' and 'long'
Seems I was getting this error when calling line 99 in ClientXMPP. You can't bit-shift a 1 and a string and this is why this error is coming up. I removed the "SRV" argument and used the default of 1. not sure exactly what this should be so it may need to be fixed back before it's merged back to trunk.
The line in question:
answers = dns.resolver.query("_xmpp-client._tcp.%s" % self.server, "SRV")
|
||
|---|---|---|
| .. | ||
| plugins | ||
| stanza | ||
| tests | ||
| xmlstream | ||
| __init__.py | ||
| basexmpp.py | ||
| component_example.py | ||
| componentxmpp.py | ||
| exceptions.py | ||