Changeset 913a663 for protocols/msn/gw.c

Timestamp:

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

Author:

dequis <dx@…>

Branches:

master

Children:

73b1a8e

Parents:

a4be2f6

git-author:

dequis <dx@…> (14-03-15 12:00:58)

git-committer:

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

Message:

msn: implement the rest of the http gateway support, enable by default

File:

• protocols/msn/gw.c (modified) (6 diffs)

protocols/msn/gw.c

@@ -30 +30 @@
 void msn_gw_free(struct msn_gw *gw)
 {
+        if (gw->poll_timeout != -1) {
+                b_event_remove(gw->poll_timeout);
+        }
         g_byte_array_free(gw->in, TRUE);
         g_byte_array_free(gw->out, TRUE);
@@ -66 +69 @@
         struct msn_gw *gw = req->data;
 
+        gw->waiting = FALSE;
+
+        if (!gw->open) {
+                /* the user tried to logout while the request was pending
+                 * see msn_ns_close() */
+                msn_gw_free(gw);
+                return;
+        }
+
+        if (getenv("BITLBEE_DEBUG")) {
+                fprintf(stderr, "\n\x1b[90mHTTP:%s\n", req->reply_body);
+                fprintf(stderr, "\n\x1b[97m\n");
+        }
+
+        if (req->status_code != 200) {
+                gw->callback(gw->data, -1, B_EV_IO_READ);
+                return;
+        }
+
         if ((value = get_rfc822_header(req->reply_headers, "X-MSN-Messenger", 0))) {
                 if (!msn_gw_parse_session_header(gw, value)) {
-                        /* XXX handle this */
+                        gw->callback(gw->data, -1, B_EV_IO_READ);
+                        g_free(value);
+                        return;
                 }
                 g_free(value);
@@ -78 +102 @@
         }
 
-        /* XXX handle reply */
+        if (req->body_size) {
+                g_byte_array_append(gw->in, (const guint8 *) req->reply_body, req->body_size);
+                gw->callback(gw->data, -1, B_EV_IO_READ);
+        }
 
         if (gw->poll_timeout != -1) {
@@ -104 +131 @@
 
         http_dorequest(gw->last_host, gw->port, gw->ssl, request, msn_gw_callback, gw);
+        gw->open = TRUE;
         gw->waiting = TRUE;
 
@@ -113 +141 @@
 {
         msn_gw_dorequest(gw, "Action=open&Server=NS");
-        gw->open = TRUE;
 }
 
@@ -125 +152 @@
         return FALSE;
 }
+
+ssize_t msn_gw_read(struct msn_gw *gw, char **buf)
+{
+        size_t bodylen;
+        if (!gw->open) {
+                return 0;
+        }
+
+        bodylen = gw->in->len;
+        g_byte_array_append(gw->in, (guint8 *) "", 1); /* nullnullnull */
+        *buf = (char *) g_byte_array_free(gw->in, FALSE);
+        gw->in = g_byte_array_new();
+        return bodylen;
+}
+
+void msn_gw_write(struct msn_gw *gw, char *buf, size_t len)
+{
+        g_byte_array_append(gw->out, (const guint8 *) buf, len);
+        if (!gw->open) {
+                msn_gw_open(gw);
+        } else if (!gw->waiting) {
+                msn_gw_dorequest(gw, NULL);
+        }
+}