ssld: Fix an fd leak when closing connections.

Lightly tested.

diff --git a/ssld/ssld.c b/ssld/ssld.c
index d9dbfa5cb19420488d3c9b53887537ad13b13f71..b28520da8dd785e1116134fe7aebaab3666d51d1 100644 (file)
--- a/ssld/ssld.c
+++ b/ssld/ssld.c
@@ -171,6 +171,7 @@ static void conn_mod_write_sendq(rb_fde_t *, void *data);
 static void conn_plain_write_sendq(rb_fde_t *, void *data);
 static void mod_write_ctl(rb_fde_t *, void *data);
 static void conn_plain_read_cb(rb_fde_t *fd, void *data);
+static void conn_plain_read_shutdown_cb(rb_fde_t *fd, void *data);
 static void mod_cmd_write_queue(mod_ctl_t * ctl, const void *data, size_t len);
 static const char *remote_closed = "Remote host closed the connection";
 static int ssl_ok;
@@ -262,16 +263,17 @@ close_conn(conn_t * conn, int wait_plain, const char *fmt, ...)
        rb_close(conn->mod_fd);
        SetDead(conn);
 
+       if(conn->id >= 0 && !IsZipSSL(conn))
+               rb_dlinkDelete(&conn->node, connid_hash(conn->id));
+
        if(!wait_plain || fmt == NULL)
        {
                rb_close(conn->plain_fd);
-
-               if(conn->id >= 0 && !IsZipSSL(conn))
-                       rb_dlinkDelete(&conn->node, connid_hash(conn->id));
                rb_dlinkAdd(conn, &conn->node, &dead_list);
                return;
        }
-       rb_setselect(conn->plain_fd, RB_SELECT_WRITE | RB_SELECT_READ, NULL, NULL);
+       rb_setselect(conn->plain_fd, RB_SELECT_READ, conn_plain_read_shutdown_cb, conn);
+       rb_setselect(conn->plain_fd, RB_SELECT_WRITE, NULL, NULL);
        va_start(ap, fmt);
        rb_vsnprintf(reason, sizeof(reason), fmt, ap);
        va_end(ap);
@@ -541,6 +543,34 @@ conn_plain_read_cb(rb_fde_t *fd, void *data)
        }
 }
 
+static void
+conn_plain_read_shutdown_cb(rb_fde_t *fd, void *data)
+{
+       conn_t *conn = data;
+       int length = 0;
+
+       if(conn == NULL)
+               return;
+
+       while(1)
+       {
+               length = rb_read(conn->plain_fd, inbuf, sizeof(inbuf));
+
+               if(length == 0 || (length < 0 && !rb_ignore_errno(errno)))
+               {
+                       rb_close(conn->plain_fd);
+                       rb_dlinkAdd(conn, &conn->node, &dead_list);
+                       return;
+               }
+
+               if(length < 0)
+               {
+                       rb_setselect(conn->plain_fd, RB_SELECT_READ, conn_plain_read_shutdown_cb, conn);
+                       return;
+               }
+       }
+}
+
 static void
 conn_mod_read_cb(rb_fde_t *fd, void *data)
 {