Author: junglecow
Date: 2007-03-03 21:13:43 +0100 (Sat, 03 Mar 2007)
New Revision: 8000
Modified:
trunk/src/common/xmpp/transports_nb.py
Log:
- Workaround for #2846: Make the error silent. Fixes #2846.
- Workaround for #2838: Use synchronous (blocking) SSL handshake. Fixes #2838.
Modified: trunk/src/common/xmpp/transports_nb.py
===================================================================
--- trunk/src/common/xmpp/transports_nb.py 2007-03-03 11:06:57 UTC (rev 7999)
+++ trunk/src/common/xmpp/transports_nb.py 2007-03-03 20:13:43 UTC (rev 8000)
@@ -541,8 +541,16 @@
self._sock.connect(self._server)
except socket.error, e:
errnum = e[0]
+
+ # Ignore "Socket already connected".
+ # FIXME: This happens when we switch an already
+ # connected socket to SSL (STARTTLS). Instead of
+ # ignoring the error, the socket should only be
+ # connected to once. See #2846.
+ workaround = (errno.EALREADY, 10056)
+
# 10035 - winsock equivalent of EINPROGRESS
- if errnum not in (errno.EINPROGRESS, 10035):
+ if errnum not in (errno.EINPROGRESS, 10035) + workaround:
log.error("_do_connect:", exc_info=True)
#traceback.print_exc()
# in progress, or would block
@@ -732,15 +740,17 @@
tcpsock._send = wrapper.send
log.debug("Initiating handshake...")
- tcpsock._sslObj.setblocking(False)
+ # FIXME: Figure out why _connect_success is called before the
+ # SSL handshake is completed in STARTTLS mode. See #2838.
+ tcpsock._sslObj.setblocking(True)
try:
self.starttls='in progress'
tcpsock._sslObj.do_handshake()
except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError), e:
pass
- #tcpsock._sslObj.setblocking(False)
- #print "Done handshake"
- log.debug("Async handshake started...")
+ tcpsock._sslObj.setblocking(False)
+ log.debug("Synchronous handshake completed")
+ #log.debug("Async handshake started...")
# fake it, for now
self.starttls='success'
