Changeset c408298 for protocols/msn/ns.c

Timestamp:

2015-03-15T14:41:48Z (10 years ago)

Author:

dequis <dx@…>

Children:

b4e96d6

Parents:

e6ef4a8

git-author:

dequis <dx@…> (13-03-15 09:28:36)

git-committer:

dequis <dx@…> (15-03-15 14:41:48)

Message:

msn: add msn_queue_feed(), move read() out of msn_handler()

File:

• protocols/msn/ns.c (modified) (1 diff)

protocols/msn/ns.c

@@ -148 +148 @@
         struct msn_data *handler = data;
         struct im_connection *ic = handler->ic;
-
-        if (msn_handler(handler) == -1) {  /* Don't do this on ret == 0, it's already done then. */
+        char bytes[1024];
+        int st;
+
+        st = read(handler->fd, bytes, 1024);
+        if (st <= 0) {
                 imcb_error(ic, "Error while reading from server");
                 imc_logout(ic, TRUE);
-
                 return FALSE;
-        } else {
-                return TRUE;
-        }
+        }
+
+        msn_queue_feed(handler, bytes, st);
+
+        /* Ignore ret == 0, it's already disconnected then. */
+        msn_handler(handler);
+
+        return TRUE;
+        
 }