Changeset e530abd

Timestamp:

2010-12-20T20:51:49Z (13 years ago)

Author:

Philippe Crama <pcfeb0009@…>

Branches:

master

Children:

9c51166

Parents:

5a54ec8

Message:

Make skyped restart itself

Now skyped.py detects broken sockets and restarts itself waiting
for a new connection: this sould help with passing the tests
(see branch NetBSD-test-suite)

File:

• skype/skyped.py (modified) (11 diffs)

skype/skyped.py

@@ -42 +42 @@
         if type != KeyboardInterrupt:
                 print_exception(type, value, tb)
-        options.conn.close()
+        if options.conn: options.conn.close()
         # shut down client if it's running
         try:
@@ -52 +52 @@
 sys.excepthook = eh
 
-def input_handler(fd, io_condition):
-        global options
+def input_handler(fd):
+        global options
+        global skype
         if options.buf:
                 for i in options.buf:
                         skype.send(i.strip())
                 options.buf = None
+                return True
         else:
                 try:
@@ -64 +66 @@
                         dprint("Warning, receiving 1024 bytes failed (%s)." % s)
                         fd.close()
+                        options.conn = False
                         return False
                 for i in input.split("\n"):
@@ -79 +82 @@
 
 def send(sock, txt):
-        from time import sleep
         count = 1
         done = False
@@ -89 +91 @@
                         count += 1
                         dprint("Warning, sending '%s' failed (%s). count=%d" % (txt, s, count))
-                        sleep(1)
+                        time.sleep(1)
         if not done:
-                options.conn.close()
+                if options.conn: options.conn.close()
+                options.conn = False
+        return done
 
 def bitlbee_idle_handler(skype):
         global options
+        done = False
         if options.conn:
                 try:
                         e = "PING"
-                        send(options.conn, "%s\n" % e)
+                        done = send(options.conn, "%s\n" % e)
                         dprint("... pinged Bitlbee")
                 except Exception, s:
                         dprint("Warning, sending '%s' failed (%s)." % (e, s))
-                        options.conn.close()
-        return True
+                        if options.conn: options.conn.close()
+                        options.conn = False
+                        done = False
+        return done
 
 def server(host, port, skype):
@@ -139 +146 @@
                 dprint("Warning, receiving 1024 bytes failed (%s)." % s)
                 options.conn.close()
+                options.conn = False
                 return False
         if ret == 2:
@@ -148 +156 @@
                 dprint("Username and/or password WRONG.")
                 options.conn.send("PASSWORD KO\n")
+                options.conn.close()
+                options.conn = False
                 return False
 
@@ -191 +201 @@
                         # everybody will be happy
                         e = i.encode('UTF-8')
-                        dprint('<< ' + e)
                         if options.conn:
+                                dprint('<< ' + e)
                                 try:
                                         # I called the send function really_send
@@ -198 +208 @@
                                 except Exception, s:
                                         dprint("Warning, sending '%s' failed (%s)." % (e, s))
-                                        options.conn.close()
+                                        if options.conn: options.conn.close()
+                                        options.conn = False
+                        else:
+                                dprint('---' + e)
 
         def send(self, msg_text):
                 if not len(msg_text) or msg_text == "PONG":
+                        if msg_text == "PONG": options.last_bitlbee_pong = time.time()
                         return
                 try:
@@ -260 +274 @@
         timeout = 1; # in seconds
         skype_ping_period = 5
-        bitlbee_ping_period = 30
-        skype_ping_start_time = time.time()
-        bitlbee_ping_start_time = time.time()
-        while 1:
+        bitlbee_ping_period = 10
+        bitlbee_pong_timeout = 30
+        now = time.time()
+        skype_ping_start_time = now
+        bitlbee_ping_start_time = now
+        options.last_bitlbee_pong = now
+        in_error = []
+        handler_ok = True
+        while (len(in_error) == 0) and handler_ok and options.conn:
                 ready_to_read, ready_to_write, in_error = \
                         select.select([options.conn], [], [], timeout)
                 now = time.time()
+                handler_ok = True
                 if len(ready_to_read) == 1:
-                        input_handler(ready_to_read.pop(), options)
+                        handler_ok = input_handler(ready_to_read.pop())
                         # don't ping bitlbee/skype if they already received data
                         bitlbee_ping_start_time = now
                         skype_ping_start_time = now
-                if now - skype_ping_period > skype_ping_start_time:
-                        skype_idle_handler(skype)
+                if (now - skype_ping_period > skype_ping_start_time) and handler_ok:
+                        handler_ok = skype_idle_handler(skype)
                         skype_ping_start_time = now
                 if now - bitlbee_ping_period > bitlbee_ping_start_time:
-                        bitlbee_idle_handler(skype)
+                        handler_ok = bitlbee_idle_handler(skype)
                         bitlbee_ping_start_time = now
+                        if options.last_bitlbee_pong:
+                                if (now - options.last_bitlbee_pong) > bitlbee_pong_timeout:
+                                        dprint("Bitlbee pong timeout")
+                                        # TODO is following line necessary? Should there be a options.conn.unwrap() somewhere?
+                                        # options.conn.shutdown()
+                                        if options.conn: options.conn.close()
+                                        options.conn = False
+                                else:
+                                        dprint("%f seconds since last PONG" % (now - options.last_bitlbee_pong))
+                        else:
+                                options.last_bitlbee_pong = now
+        dprint("Serverloop done")
 
 if __name__=='__main__':
@@ -347 +379 @@
         except Skype4Py.SkypeAPIError, s:
                 sys.exit("%s. Are you sure you have started Skype?" % s)
-        server(options.host, options.port, skype)
+        while 1:
+                options.conn = False
+                server(options.host, options.port, skype)