Changeset 6b9cab1 for skype/skyped.py

Timestamp:

2008-11-16T01:16:54Z (16 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

56ae398

Parents:

c1bf7c5

Message:

skyped: handle the case when even reading the user/pass fails

ideally this is rare, i never got a network error right after connect,
but you can never be sure.. ;)

File:

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

skype/skyped.py

@@ -118 +118 @@
                         return False
         ret = 0
-        line = options.conn.recv(1024)
-        if line.startswith("USERNAME") and line.split(' ')[1].strip() == options.config.username:
-                ret += 1
-        line = options.conn.recv(1024)
-        if line.startswith("PASSWORD") and sha.sha(line.split(' ')[1].strip()).hexdigest() == options.config.password:
-                ret += 1
+        try:
+                line = options.conn.recv(1024)
+                if line.startswith("USERNAME") and line.split(' ')[1].strip() == options.config.username:
+                        ret += 1
+                line = options.conn.recv(1024)
+                if line.startswith("PASSWORD") and sha.sha(line.split(' ')[1].strip()).hexdigest() == options.config.password:
+                        ret += 1
+        except Exception, s:
+                dprint("Warning, receiving 1024 bytes failed (%s)." % s)
+                options.conn.close()
+                return False
         if ret == 2:
                 dprint("Username and password OK.")