From 4e12e228cb2fbc6fe2941070fe1ea44e01e4a9fb Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Fri, 10 Aug 2012 12:40:28 -0700 Subject: Fix tracking service name for DIGEST-MD5 --- sleekxmpp/xmlstream/xmlstream.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'sleekxmpp/xmlstream/xmlstream.py') diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index f72171a1..8f8e94fd 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -192,6 +192,7 @@ class XMLStream(object): #: The expected name of the server, for validation. self._expected_server_name = '' + self._service_name = '' #: The desired, or actual, address of the connected server. self.address = (host, int(port)) @@ -473,8 +474,10 @@ class XMLStream(object): if self.default_domain: try: - self.address = self.pick_dns_answer(self.default_domain, - self.address[1]) + host, address, port = self.pick_dns_answer(self.default_domain, + self.address[1]) + self.address = (address, port) + self._service_name = host except StopIteration: log.debug("No remaining DNS records to try.") self.dns_answers = None -- cgit v1.2.3 From f7a710e55bf433a378dee4bd05f6ceb59f2e9e2d Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Fri, 10 Aug 2012 14:12:05 -0700 Subject: Add abort() method to kill the session and stop all processing without properly closing the stream. --- sleekxmpp/xmlstream/xmlstream.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'sleekxmpp/xmlstream/xmlstream.py') diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index 8f8e94fd..f56c360e 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -726,6 +726,20 @@ class XMLStream(object): self.event("disconnected", direct=True) return True + def abort(self): + self.session_started_event.clear() + self.stop.set() + if self._disconnect_wait_for_threads: + self._wait_for_threads() + try: + self.socket.shutdown(Socket.SHUT_RDWR) + self.socket.close() + self.filesocket.close() + except Socket.error: + pass + self.state.transition_any(['connected', 'disconnected'], 'disconnected', func=lambda: True) + self.event("killed", direct=True) + def reconnect(self, reattempt=True, wait=False, send_close=True): """Reset the stream's state and reconnect to the server.""" log.debug("reconnecting...") -- cgit v1.2.3