Changeset 728 for branches/ithildin-1.1

Timestamp:

05/12/06 00:36:30 (6 years ago)

Author:

wd

Message:

Update some commentary, request a client sendq flush when the connection is
closed

Location:

branches/ithildin-1.1/modules/ircd

Files:

• client.c (modified) (1 diff)
• connection.c (modified) (1 diff)
• server.c (modified) (1 diff)

branches/ithildin-1.1/modules/ircd/client.c

@@ -114 +114 @@
             ircd.stats.serv.unkclients--;
         cli->conn->cli = NULL;
-        destroy_connection(cli->conn, msg);
+
+        /* If sendq_flush does not close the connection for us (it will
+         * return 0 if it does) then close the connection.  This ensures
+         * that we do best-effort work on dumping the last dribbly bits of
+         * the sendq out to the client if we can.  We do not try hard to
+         * make this work, though! */
+        if (sendq_flush(cli->conn))
+            destroy_connection(cli->conn, msg);
     }
 

branches/ithildin-1.1/modules/ircd/connection.c

@@ -47 +47 @@
     /* Try to send them an error message if we can.  We assume someone has
      * tried to flush their sendq or doesn't think we should, so if it's
-     * empty we send an error, otherwise we clean it off... */
+     * empty we send an error, otherwise we clean it off and don't bother
+     * trying to send since other sends have already failed (and we infer
+     * that this means the socket is not writeable) */
     if (STAILQ_EMPTY(&c->sendq) && reason != NULL && *reason != '\0') {
         snprintf(msg, 512, "\r\nERROR :Closing Link: %s (%s)\r\n", 

branches/ithildin-1.1/modules/ircd/server.c

@@ -117 +117 @@
     }
 
-    /* if this server is ours, we have to close the connection.  also, we
-     * should try as best we can to flush the buffer.  this probably won't work
-     * very well, but we take a stab at it. */
+    /* If this server is ours we have to close the connection.  We try first
+     * to flush the sendq.  If sendq_flush returns 0 it has closed the
+     * connection for us (socket error), otherwise we close it ourself. */
     if (MYSERVER(srv)) {
-        if (sendq_flush(srv->conn)) {
-            srv->conn->srv = NULL;
+        srv->conn->srv = NULL;
+        if (sendq_flush(srv->conn))
             destroy_connection(srv->conn, msg);
-        }
     }