Changeset b994034

Timestamp:

2015-05-31T02:40:05Z (9 years ago)

Author:

dequis <dx@…>

Children:

3c28bd4

Parents:

3fb7139

git-author:

dequis <dx@…> (15-05-15 04:04:28)

git-committer:

dequis <dx@…> (31-05-15 02:40:05)

Message:

msn: check for dead connections in msn_ns_callback

Location:

protocols/msn

Files:

• gw.c (modified) (3 diffs)
• ns.c (modified) (2 diffs)

protocols/msn/gw.c

@@ -85 +85 @@
 
         if (req->status_code != 200 || !req->reply_body) {
-                gw->callback(gw->md, -1, B_EV_IO_READ);
+                gw->callback(req->data, -1, B_EV_IO_READ);
                 return;
         }
@@ -96 +96 @@
         if ((value = get_rfc822_header(req->reply_headers, "X-MSN-Messenger", 0))) {
                 if (!msn_gw_parse_session_header(gw, value)) {
-                        gw->callback(gw->md, -1, B_EV_IO_READ);
+                        gw->callback(req->data, -1, B_EV_IO_READ);
                         g_free(value);
                         return;
@@ -111 +111 @@
                 g_byte_array_append(gw->in, (const guint8 *) req->reply_body, req->body_size);
 
-                if (!gw->callback(gw->md, -1, B_EV_IO_READ)) {
+                if (!gw->callback(req->data, -1, B_EV_IO_READ)) {
                         return;
                 }

protocols/msn/ns.c

@@ -150 +150 @@
         if (msn_ns_write_cmd(ic, "CNT", "CON", "<connect><ver>2</ver><agent><os>winnt</os><osVer>5.2</osVer><proc>x86</proc><lcid>en-us</lcid></agent></connect>")) {
                 if (!md->is_http) {
-                        md->inpa = b_input_add(md->fd, B_EV_IO_READ, msn_ns_callback, md);
+                        md->inpa = b_input_add(md->fd, B_EV_IO_READ, msn_ns_callback, ic);
                 }
                 imcb_log(ic, "Connected to server, waiting for reply");
@@ -182 +182 @@
 static gboolean msn_ns_callback(gpointer data, gint source, b_input_condition cond)
 {
-        struct msn_data *md = data;
-        struct im_connection *ic = md->ic;
+        struct im_connection *ic = data;
+        struct msn_data *md;
         char *bytes;
         int st;
+
+        if (g_slist_find(msn_connections, ic) == NULL) {
+                return FALSE;
+        }
+
+        md = ic->proto_data;
 
         if (md->is_http) {