Changeset 3fbce97 for protocols/msn/gw.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into parson

File:

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

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);
+        }
+}