Changeset a4be2f6 for protocols/msn/msn_util.c

Timestamp:

2015-04-10T17:10:41Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

913a663

Parents:

3b09b38

git-author:

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

git-committer:

dequis <dx@…> (10-04-15 17:10:41)

Message:

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

File:

• protocols/msn/msn_util.c (modified) (2 diffs)

protocols/msn/msn_util.c

@@ -172 +172 @@
 }
 
+void msn_queue_feed(struct msn_data *h, char *bytes, int st)
+{
+        h->rxq = g_renew(char, h->rxq, h->rxlen + 1024);
+        memcpy(h->rxq + h->rxlen, bytes, st);
+        h->rxlen += st;
+
+        if (getenv("BITLBEE_DEBUG")) {
+                fprintf(stderr, "\n\x1b[92m<<< ");
+                write(2, bytes , st);
+                fprintf(stderr, "\x1b[97m");
+        }
+}
+
 /* This one handles input from a MSN Messenger server. Both the NS and SB servers usually give
    commands, but sometimes they give additional data (payload). This function tries to handle
@@ -182 +195 @@
 int msn_handler(struct msn_data *h)
 {
-        struct im_connection *ic = h->ic;
-        int st;
-
-        h->rxq = g_renew(char, h->rxq, h->rxlen + 1024);
-        st = read(h->fd, h->rxq + h->rxlen, 1024);
-        h->rxlen += st;
-
-        if (st <= 0) {
-                fprintf(stderr, "\n\x1b[92m<<< [closed]\x1b[97m ");
-                return(-1);
-        }
-
-        if (getenv("BITLBEE_DEBUG")) {
-                fprintf(stderr, "\n\x1b[92m<<< ");
-                write(2, h->rxq + h->rxlen - st, st);
-                fprintf(stderr, "\x1b[97m");
-        }
+        int st = 1;
 
         while (st) {