Fix hangs on some SSL connections

Found by: pym67, @PeGaSuS-Coder 
Patch by: michaelortmann
Fixes: #1496

This PR fixes Eggdrop hanging on some socket connections by upping the read buffer size for SSL_read() and read() to 16K, the maximum according to SSL spec and to openssls internal buffer size. It may also help resolve some hanging userfile transfers.

Author: michaelortmann

src/Makefile.in

@@ -174,8 +174,7 @@ modules.o: modules.c main.h ../config.h ../eggint.h ../lush.h lang.h \
 net.o: net.c main.h ../config.h ../eggint.h ../lush.h lang.h eggdrop.h \
  compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h tclhash.h \
  chan.h users.h compat/compat.h compat/base64.h compat/inet_aton.h \
- ../src/main.h compat/snprintf.h compat/explicit_bzero.h compat/strlcpy.h \
- mod/server.mod/server.h
+ ../src/main.h compat/snprintf.h compat/explicit_bzero.h compat/strlcpy.h
 rfc1459.o: rfc1459.c main.h ../config.h ../eggint.h ../lush.h lang.h \
  eggdrop.h compat/in6.h flags.h proto.h misc_file.h cmdt.h tclegg.h \
  tclhash.h chan.h users.h compat/compat.h compat/base64.h \

src/eggdrop.h

@@ -60,6 +60,7 @@
 #define UHOSTMAX    291 + NICKMAX /* 32 (ident) + 3 (\0, !, @) + NICKMAX */
 #define DIRMAX      512           /* paranoia                            */
 #define LOGLINEMAX  9000          /* for misc.c/putlog() <cybah>         */
+#define READMAX     16384         /* for read() and SSL_read()           */
 
 /* Invalid characters */
 #define BADHANDCHARS "-,+*=:!.@#;$%&"

src/main.c

@@ -787,7 +787,7 @@ static void mainloop(int toplevel)
 {
   static int cleanup = 5;
   int xx, i, eggbusy = 1;
-  char buf[8702];
+  char buf[READMAX + 2];
 
   /* Lets move some of this here, reducing the number of actual
    * calls to periodic_timers

src/net.c

@@ -42,7 +42,6 @@
 #  include <unistd.h>
 #endif
 #include <setjmp.h>
-#include "mod/server.mod/server.h"
 
 #ifdef TLS
 #  include <openssl/err.h>
@@ -894,7 +893,7 @@ int sockread(char *s, int *len, sock_list *slist, int slistmax, int tclonly)
   struct timeval t;
   fd_set fdr, fdw, fde;
   int i, x, maxfd_r, maxfd_w, maxfd_e;
-  int grab = 511, tclsock = -1, events = 0;
+  int grab = READMAX, tclsock = -1, events = 0;
   struct threaddata *td = threaddata();
   int maxfd;
 #ifdef EGG_TDNS
@@ -938,8 +937,7 @@ int sockread(char *s, int *len, sock_list *slist, int slistmax, int tclonly)
     if (!tclonly && ((!(slist[i].flags & (SOCK_UNUSED | SOCK_TCL))) &&
         ((FD_ISSET(slist[i].sock, &fdr)) ||
 #ifdef TLS
-        (slist[i].ssl && (SSL_pending(slist[i].ssl) ||
-         !SSL_is_init_finished(slist[i].ssl))) ||
+        (slist[i].ssl && !SSL_is_init_finished(slist[i].ssl)) ||
 #endif
         ((slist[i].sock == STDOUT) && (!backgrd) &&
          (FD_ISSET(STDIN, &fdr)))))) {
@@ -1102,7 +1100,7 @@ int sockread(char *s, int *len, sock_list *slist, int slistmax, int tclonly)
 
 int sockgets(char *s, int *len)
 {
-  char xx[RECVLINEMAX], *p, *px, *p2;
+  char xx[READMAX + 2], *p, *px, *p2;
   int ret, i, data = 0;
   size_t len2;
   struct threaddata *td = threaddata();
@@ -1129,7 +1127,7 @@ int sockgets(char *s, int *len)
             p++;
           *p2 = 0;
 
-          strlcpy(s, socklist[i].handler.sock.inbuf, RECVLINEMAX-1);
+          strlcpy(s, socklist[i].handler.sock.inbuf, READMAX + 1);
           if (*p) {
             len2 = strlen(p) + 1;
             px = nmalloc(len2);
@@ -1145,15 +1143,15 @@ int sockgets(char *s, int *len)
         }
       } else {
         /* Handling buffered binary data (must have been SOCK_BUFFER before). */
-        if (socklist[i].handler.sock.inbuflen <= RECVLINEMAX-2) {
+        if (socklist[i].handler.sock.inbuflen <= READMAX) {
           *len = socklist[i].handler.sock.inbuflen;
           memcpy(s, socklist[i].handler.sock.inbuf, socklist[i].handler.sock.inbuflen);
           nfree(socklist[i].handler.sock.inbuf);
           socklist[i].handler.sock.inbuf = NULL;
           socklist[i].handler.sock.inbuflen = 0;
         } else {
-          /* Split up into chunks of RECVLINEMAX-2 bytes. */
-          *len = RECVLINEMAX-2;
+          /* Split up into chunks of READMAX bytes. */
+          *len = READMAX;
           memcpy(s, socklist[i].handler.sock.inbuf, *len);
           memcpy(socklist[i].handler.sock.inbuf, socklist[i].handler.sock.inbuf + *len, *len);
           socklist[i].handler.sock.inbuflen -= *len;
@@ -1218,17 +1216,17 @@ int sockgets(char *s, int *len)
     strcpy(socklist[ret].handler.sock.inbuf, p);
     strcat(socklist[ret].handler.sock.inbuf, xx);
     nfree(p);
-    if (strlen(socklist[ret].handler.sock.inbuf) < RECVLINEMAX) {
+    if (strlen(socklist[ret].handler.sock.inbuf) < READMAX + 2) {
       strcpy(xx, socklist[ret].handler.sock.inbuf);
       nfree(socklist[ret].handler.sock.inbuf);
       socklist[ret].handler.sock.inbuf = NULL;
       socklist[ret].handler.sock.inbuflen = 0;
     } else {
       p = socklist[ret].handler.sock.inbuf;
-      socklist[ret].handler.sock.inbuflen = strlen(p) - RECVLINEMAX-2;
+      socklist[ret].handler.sock.inbuflen = strlen(p) - READMAX;
       socklist[ret].handler.sock.inbuf = nmalloc(socklist[ret].handler.sock.inbuflen + 1);
-      strcpy(socklist[ret].handler.sock.inbuf, p + RECVLINEMAX-2);
-      *(p + RECVLINEMAX-2) = 0;
+      strcpy(socklist[ret].handler.sock.inbuf, p + READMAX);
+      *(p + READMAX) = 0;
       strcpy(xx, p);
       nfree(p);
       /* (leave the rest to be post-pended later) */
@@ -1249,7 +1247,7 @@ int sockgets(char *s, int *len)
 /* if (!s[0]) strcpy(s," ");  */
   if (!data) { 
     s[0] = 0;
-    if (strlen(xx) >= RECVLINEMAX-2) {
+    if (strlen(xx) >= READMAX) {
       /* String is too long, so just insert fake \n */
       strcpy(s, xx);
       xx[0] = 0;