Changeset 4e4616a for protocols

Timestamp:

2015-11-28T15:59:34Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

e61f9d1

Parents:

31d9930

Message:

msn: Buffer writes a bit to send several commands with a single request

Just a 1msec timeout, so that it will run in the next main loop
iteration.

The official clients send the first few commands in the same request,
which reduces roundtrips during login. This commit doesn't do that.

Location:

protocols/msn

Files:

• gw.c (modified) (4 diffs)
• msn.h (modified) (1 diff)

protocols/msn/gw.c

@@ -22 +22 @@
         gw->ssl = (GATEWAY_PORT == 443);
         gw->poll_timeout = -1;
+        gw->write_timeout = -1;
         gw->ic = ic;
         gw->md = ic->proto_data;
@@ -34 +35 @@
                 b_event_remove(gw->poll_timeout);
         }
+
+        if (gw->write_timeout != -1) {
+                b_event_remove(gw->write_timeout);
+        }
+
         g_byte_array_free(gw->in, TRUE);
         g_byte_array_free(gw->out, TRUE);
@@ -189 +195 @@
 }
 
-void msn_gw_write(struct msn_gw *gw, char *buf, size_t len)
-{
-        g_byte_array_append(gw->out, (const guint8 *) buf, len);
+static gboolean msn_gw_write_cb(gpointer data, gint source, b_input_condition cond)
+{
+        struct msn_gw *gw;
+        
+        if (!(gw = msn_gw_from_ic(data))) {
+                return FALSE;
+        }
+
         if (!gw->open) {
                 msn_gw_open(gw);
@@ -197 +208 @@
                 msn_gw_dorequest(gw, NULL);
         }
-}
+
+        gw->write_timeout = -1;
+        return FALSE;
+}
+
+void msn_gw_write(struct msn_gw *gw, char *buf, size_t len)
+{
+        g_byte_array_append(gw->out, (const guint8 *) buf, len);
+
+        /* do a bit of buffering here to send several commands with a single request */
+        if (gw->write_timeout == -1) {
+                gw->write_timeout = b_timeout_add(1, msn_gw_write_cb, gw->ic);
+        }
+}

protocols/msn/msn.h

@@ -112 +112 @@
 
         int poll_timeout;
+        int write_timeout;
 
         b_event_handler callback;