Importing r25217, r25219 and r25221 from ratbox3

[solanum.git] / ssld / ssld.c

diff --git a/ssld/ssld.c b/ssld/ssld.c
index 238201cb1eacb64e0c7e4c215bf779cfd6e6412d..6d30932992bbfbb1a5a3d15b14336131e9867c95 100644 (file)
--- a/ssld/ssld.c
+++ b/ssld/ssld.c
@@ -18,13 +18,13 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
  *  USA
  *
- *  $Id: ssld.c 25179 2008-03-30 16:34:57Z androsyn $
+ *  $Id: ssld.c 25221 2008-04-09 22:12:16Z jilles $
  */
 
 
 #include "stdinc.h"
 
-#ifdef HAVE_ZLIB
+#ifdef HAVE_LIBZ
 #include <zlib.h>
 #endif
 
@@ -96,7 +96,7 @@ typedef struct _mod_ctl
 static mod_ctl_t *mod_ctl;
 
 
-#ifdef HAVE_ZLIB
+#ifdef HAVE_LIBZ
 typedef struct _zlib_stream
 {
        z_stream instream;
@@ -127,22 +127,29 @@ typedef struct _conn
 #define FLAG_ZIP       0x02
 #define FLAG_CORK      0x04
 #define FLAG_DEAD      0x08
-
+#define FLAG_SSL_W_WANTS_R 0x10 /* output needs to wait until input possible */
+#define FLAG_SSL_R_WANTS_W 0x20 /* input needs to wait until output possible */
 
 #define IsSSL(x) ((x)->flags & FLAG_SSL)
 #define IsZip(x) ((x)->flags & FLAG_ZIP)
 #define IsCork(x) ((x)->flags & FLAG_CORK)
 #define IsDead(x) ((x)->flags & FLAG_DEAD)
+#define IsSSLWWantsR(x) ((x)->flags & FLAG_SSL_W_WANTS_R)
+#define IsSSLRWantsW(x) ((x)->flags & FLAG_SSL_R_WANTS_W)
 
 #define SetSSL(x) ((x)->flags |= FLAG_SSL)
 #define SetZip(x) ((x)->flags |= FLAG_ZIP)
 #define SetCork(x) ((x)->flags |= FLAG_CORK)
 #define SetDead(x) ((x)->flags |= FLAG_DEAD)
+#define SetSSLWWantsR(x) ((x)->flags |= FLAG_SSL_W_WANTS_R)
+#define SetSSLRWantsW(x) ((x)->flags |= FLAG_SSL_R_WANTS_W)
 
 #define ClearSSL(x) ((x)->flags &= ~FLAG_SSL)
 #define ClearZip(x) ((x)->flags &= ~FLAG_ZIP)
 #define ClearCork(x) ((x)->flags &= ~FLAG_CORK)
 #define ClearDead(x) ((x)->flags &= ~FLAG_DEAD)
+#define ClearSSLWWantsR(x) ((x)->flags &= ~FLAG_SSL_W_WANTS_R)
+#define ClearSSLRWantsW(x) ((x)->flags &= ~FLAG_SSL_R_WANTS_W)
 
 #define NO_WAIT 0x0
 #define WAIT_PLAIN 0x1
@@ -153,6 +160,7 @@ typedef struct _conn
 static rb_dlink_list connid_hash_table[CONN_HASH_SIZE];
 static rb_dlink_list dead_list;
 
+static void conn_mod_read_cb(rb_fde_t * fd, void *data);
 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);
@@ -160,7 +168,7 @@ static void conn_plain_read_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;
-#ifdef HAVE_ZLIB
+#ifdef HAVE_LIBZ
 static int zlib_ok = 1;
 #else
 static int zlib_ok = 0;
@@ -288,6 +296,14 @@ conn_mod_write_sendq(rb_fde_t * fd, void *data)
        if(IsDead(conn))
                return;
 
+       if(IsSSLWWantsR(conn))
+       {
+               ClearSSLWWantsR(conn);
+               conn_mod_read_cb(conn->mod_fd, conn);
+               if(IsDead(conn))
+                       return;
+       }
+
        while ((retlen = rb_rawbuf_flush(conn->modbuf_out, fd)) > 0)
                conn->mod_out += retlen;
 
@@ -304,11 +320,14 @@ conn_mod_write_sendq(rb_fde_t * fd, void *data)
        }
        if(rb_rawbuf_length(conn->modbuf_out) > 0)
        {
-               int flags = RB_SELECT_WRITE;
-               if(retlen == RB_RW_SSL_NEED_READ)
-                       flags |= RB_SELECT_READ;
-
-               rb_setselect(conn->mod_fd, flags, conn_mod_write_sendq, conn);
+               if(retlen != RB_RW_SSL_NEED_READ)
+                       rb_setselect(conn->mod_fd, RB_SELECT_WRITE, conn_mod_write_sendq, conn);
+               else
+               {
+                       rb_setselect(conn->mod_fd, RB_SELECT_READ, conn_mod_write_sendq, conn);
+                       rb_setselect(conn->mod_fd, RB_SELECT_WRITE, NULL, NULL);
+                       SetSSLWWantsR(conn);
+               }
        }
        else
                rb_setselect(conn->mod_fd, RB_SELECT_WRITE, NULL, NULL);
@@ -350,7 +369,7 @@ mod_cmd_write_queue(mod_ctl_t * ctl, const void *data, size_t len)
        mod_write_ctl(ctl->F, ctl);
 }
 
-#ifdef HAVE_ZLIB
+#ifdef HAVE_LIBZ
 static void
 common_zlib_deflate(conn_t * conn, void *buf, size_t len)
 {
@@ -475,7 +494,7 @@ conn_plain_read_cb(rb_fde_t * fd, void *data)
                }
                conn->plain_in += length;
 
-#ifdef HAVE_ZLIB
+#ifdef HAVE_LIBZ
                if(IsZip(conn))
                        common_zlib_deflate(conn, inbuf, length);
                else
@@ -499,6 +518,14 @@ conn_mod_read_cb(rb_fde_t * fd, void *data)
        if(IsDead(conn))
                return;
 
+       if(IsSSLRWantsW(conn))
+       {
+               ClearSSLRWantsW(conn);
+               conn_mod_write_sendq(conn->mod_fd, conn);
+               if(IsDead(conn))
+                       return;
+       }
+
        while (1)
        {
                if(IsDead(conn))
@@ -522,16 +549,19 @@ conn_mod_read_cb(rb_fde_t * fd, void *data)
                }
                if(length < 0)
                {
-                       int flags = RB_SELECT_READ;
-                       if(length == RB_RW_SSL_NEED_WRITE)
-                               flags |= RB_SELECT_WRITE;
-                               
-                       rb_setselect(conn->mod_fd, flags, conn_mod_read_cb, conn);
+                       if(length != RB_RW_SSL_NEED_WRITE)
+                               rb_setselect(conn->mod_fd, RB_SELECT_READ, conn_mod_read_cb, conn);
+                       else
+                       {
+                               rb_setselect(conn->mod_fd, RB_SELECT_READ, NULL, NULL);
+                               rb_setselect(conn->mod_fd, RB_SELECT_WRITE, conn_mod_read_cb, conn);
+                               SetSSLRWantsW(conn);
+                       }
                        conn_plain_write_sendq(conn->plain_fd, conn);
                        return;
                }       
                conn->mod_in += length;
-#ifdef HAVE_ZLIB
+#ifdef HAVE_LIBZ
                if(IsZip(conn))
                        common_zlib_inflate(conn, inbuf, length);
                else
@@ -685,7 +715,7 @@ process_stats(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb)
        mod_cmd_write_queue(ctl, outstat, strlen(outstat) + 1); /* +1 is so we send the \0 as well */
 }
 
-#ifdef HAVE_ZLIB
+#ifdef HAVE_LIBZ
 static void
 zlib_send_zip_ready(mod_ctl_t *ctl, conn_t *conn)
 {
@@ -884,7 +914,7 @@ mod_process_cmd_recv(mod_ctl_t * ctl)
                                process_stats(ctl, ctl_buf);
                                break;
                        }
-#ifdef HAVE_ZLIB
+#ifdef HAVE_LIBZ
                case 'Z':
                        {
                                /* just zlib only */
@@ -1001,7 +1031,7 @@ main(int argc, char **argv)
        if(s_ctlfd == NULL || s_pipe == NULL)
        {
                fprintf(stderr, "This is ircd-ratbox ssld.  You know you aren't supposed to run me directly?\n");
-               fprintf(stderr, "You get an Id tag for this: $Id: ssld.c 25179 2008-03-30 16:34:57Z androsyn $\n");
+               fprintf(stderr, "You get an Id tag for this: $Id: ssld.c 25221 2008-04-09 22:12:16Z jilles $\n");
                fprintf(stderr, "Have a nice life\n");
                exit(1);
        }