Changeset b4e96d6 for protocols/msn/ns.c

Timestamp:

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

Author:

dequis <dx@…>

Children:

89e0c94

Parents:

c408298

git-author:

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

git-committer:

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

Message:

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

File:

• protocols/msn/ns.c (modified) (7 diffs)

protocols/msn/ns.c

@@ -60 +60 @@
 
         len = strlen(out);
-        st = write(fd, out, len);
+
+        if (md->is_http) {
+                st = len;
+                msn_gw_write(md->gw, out, len);
+        } else {
+                st = write(fd, out, len);
+        }
+
         g_free(out);
         if (st != len) {
@@ -79 +86 @@
         }
 
-        handler->fd = proxy_connect(host, port, msn_ns_connected, handler);
-        if (handler->fd < 0) {
-                imcb_error(ic, "Could not connect to server");
-                imc_logout(ic, TRUE);
-                return FALSE;
+        if (handler->is_http) {
+                handler->gw = msn_gw_new(handler);
+                handler->gw->callback = msn_ns_callback;
+                msn_ns_connected(handler, -1, B_EV_IO_READ);
+        } else {
+                handler->fd = proxy_connect(host, port, msn_ns_connected, handler);
+                if (handler->fd < 0) {
+                        imcb_error(ic, "Could not connect to server");
+                        imc_logout(ic, TRUE);
+                        return FALSE;
+                }
         }
 
@@ -95 +108 @@
         struct im_connection *ic = md->ic;
 
-        if (source == -1) {
+        if (source == -1 && !md->is_http) {
                 imcb_error(ic, "Could not connect to server");
                 imc_logout(ic, TRUE);
@@ -121 +134 @@
 
         if (msn_ns_write(ic, source, "VER %d %s CVR0\r\n", ++md->trId, MSNP_VER)) {
-                handler->inpa = b_input_add(handler->fd, B_EV_IO_READ, msn_ns_callback, handler);
+                if (!handler->is_http) {
+                        handler->inpa = b_input_add(handler->fd, B_EV_IO_READ, msn_ns_callback, handler);
+                }
                 imcb_log(ic, "Connected to server, waiting for reply");
         }
@@ -130 +145 @@
 void msn_ns_close(struct msn_data *handler)
 {
+        if (handler->gw) {
+                if (handler->gw->waiting) {
+                        /* mark it as closed, let the request callback clean it */
+                        handler->gw->open = FALSE;
+                } else {
+                        msn_gw_free(handler->gw);
+                }
+        }
         if (handler->fd >= 0) {
                 closesocket(handler->fd);
@@ -148 +171 @@
         struct msn_data *handler = data;
         struct im_connection *ic = handler->ic;
-        char bytes[1024];
+        char *bytes;
         int st;
 
-        st = read(handler->fd, bytes, 1024);
+        if (handler->is_http) {
+                st = msn_gw_read(handler->gw, &bytes);
+        } else {
+                bytes = g_malloc(1024);
+                st = read(handler->fd, bytes, 1024);
+        }
+
         if (st <= 0) {
                 imcb_error(ic, "Error while reading from server");
@@ -159 +188 @@
 
         msn_queue_feed(handler, bytes, st);
+
+        g_free(bytes);
 
         /* Ignore ret == 0, it's already disconnected then. */