Changeset ed2e37f

Timestamp:

2007-08-20T16:35:48Z (17 years ago)

Author:

VMiklos <vmiklos@…>

Branches:

master

Children:

0c60f96

Parents:

ba20c39

Message:

more error handling, no more SIGPIPE \o/ :)

Location:

skype

Files:

• README (modified) (3 diffs)
• skype.c (modified) (5 diffs)

skype/README

@@ -33 +33 @@
 cp skype.so /usr/lib/bitlbee
 
-- Start the tcp server:
+- Start skyped (the tcp server):
 
 python skyped.py
@@ -48 +48 @@
 - Receiving messages
 
-- Writing a tcp daemon that is a gateway between Skype and tcp
+- skyped (the tcp daemon that is a gateway between Skype and tcp)
+
+- Error handling when skyped is not running and when it exists
 
 What needs to be done (aka. TODO):
@@ -66 +68 @@
 - maybe on account on/off, change our state from/to offline? so that we won't miss any message
 
-- handle the case when the tcp server is not running (currently SIGPIPE is not handled at all by the plugin)
-
 If something does not work and it's not in the TODO section, then please contact me!
 

skype/skype.c

@@ -7 +7 @@
  */
 #include <stdio.h>
+#include <poll.h>
 #include <bitlbee.h>
 
@@ -58 +59 @@
         printf("write(): %s", buf);
         write( sd->fd, buf, len );
-
-        // TODO: error handling
 
         return TRUE;
@@ -147 +146 @@
                                                 // new body
                                                 printf("<%s> %s\n", sd->handle, info);
-                                                imcb_buddy_msg(ic, sd->handle, info, 0, 0);
+                                                if(sd->handle)
+                                                        imcb_buddy_msg(ic, sd->handle, info, 0, 0);
                                                 g_free(sd->handle);
                                                 sd->handle = NULL;
@@ -191 +191 @@
         struct im_connection *ic = data;
         struct skype_data *sd = ic->proto_data;
-
-        imcb_connected(ic);
-        if( sd->fd < 0 )
+        struct pollfd pfd[1];
+
+        pfd[0].fd = sd->fd;
+        pfd[0].events = POLLOUT;
+
+        poll(pfd, 1, 1000);
+        if(pfd[0].revents & POLLHUP)
         {
                 imcb_error( ic, "Could not connect to server" );
@@ -199 +203 @@
                 return FALSE;
         }
+        imcb_connected(ic);
         return skype_start_stream(ic);
 }