Changeset 4da4e9b

Timestamp:

2013-02-11T12:56:04Z (12 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

b6ab05b

Parents:

5a4f22e

git-author:

Mike Kazantsev <mk.fraggod@…> (11-02-13 12:56:04)

git-committer:

Miklos Vajna <vmiklos@…> (11-02-13 12:56:04)

Message:

skype: handle socket errors during tls session negotiation in a graceful way

Before this patch, such errors (which happen 1/4 times here) lock
skyped forever, producing traceback (and hanging because threads
in python).
Proper fix would be to see why these happen (might be ssl handling
in the plugin), but that's no excuse not to handle socket errors
without crashing the daemon.

File:

• protocols/skype/skyped.py (modified) (1 diff)

protocols/skype/skyped.py

@@ -202 +202 @@
                         keyfile=options.config.sslkey,
                         ssl_version=ssl.PROTOCOL_TLSv1)
-        except ssl.SSLError:
-                dprint("Warning, SSL init failed, did you create your certificate?")
-                return False
+        except (ssl.SSLError, socket.error) as err:
+                if isinstance(err, ssl.SSLError):
+                        dprint("Warning, SSL init failed, did you create your certificate?")
+                        return False
+                else:
+                        dprint('Warning, SSL init failed')
+                        return True
         if hasattr(options.conn, 'handshake'):
                 try: