github/SleekXMPP
1
0
Fork 0
mirror of https://github.com/correl/SleekXMPP.git synced 2024-11-23 19:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into roster

Browse source
This commit is contained in:
Lance Stout 2011-03-22 12:00:01 -04:00
commit e1360ae049
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sleekxmpp/clientxmpp.py
View file

@ -132,7 +132,7 @@ class ClientXMPP(BaseXMPP):
log.debug("Session start has taken more than 15 seconds")
self.disconnect(reconnect=self.auto_reconnect)
def connect(self, address=tuple(), reattempt=True):
def connect(self, address=tuple(), reattempt=True, use_tls=True):
"""
Connect to the XMPP server.
@ -143,7 +143,9 @@ class ClientXMPP(BaseXMPP):
Arguments:
address -- A tuple containing the server's host and port.
reattempt -- If True, reattempt the connection if an
error occurs.
error occurs. Defaults to True.
use_tls -- Indicates if TLS should be used for the
connection. Defaults to True.
"""
self.session_started_event.clear()
if not address or len(address) < 2:
@ -188,7 +190,7 @@ class ClientXMPP(BaseXMPP):
address = (self.boundjid.host, 5222)
return XMLStream.connect(self, address[0], address[1],
use_tls=True, reattempt=reattempt)
use_tls=use_tls, reattempt=reattempt)
def register_feature(self, mask, pointer, breaker=False):
"""
@ -268,7 +270,9 @@ class ClientXMPP(BaseXMPP):
Arguments:
xml -- The STARTLS proceed element.
"""
if not self.authenticated and self.ssl_support:
if not self.use_tls:
return False
elif not self.authenticated and self.ssl_support:
tls_ns = 'urn:ietf:params:xml:ns:xmpp-tls'
self.add_handler("<proceed xmlns='%s' />" % tls_ns,
self._handle_tls_start,
@ -298,7 +302,8 @@ class ClientXMPP(BaseXMPP):
Arguments:
xml -- The SASL mechanisms stanza.
"""
if '{urn:ietf:params:xml:ns:xmpp-tls}starttls' in self.features:
if self.use_tls and \
'{urn:ietf:params:xml:ns:xmpp-tls}starttls' in self.features:
return False
log.debug("Starting SASL Auth")