X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/9078840563ffbb46c5a06f3eb94e5742e3ede07c..fe74809cb55b3d3162bdf7f8323b4422fe1475f9:/test/src/client.c

diff --git a/test/src/client.c b/test/src/client.c
index c0c017dd3..d56a33f40 100644
--- a/test/src/client.c
+++ b/test/src/client.c
@@ -570,12 +570,14 @@ nextinput:
     if (*inptr == 0)   /* Refill input buffer */
       {
       alarm(timeout);
+      unsigned char *inbufferp = inbuffer;
+      for (;;) {
       if (srv->tls_active)
         {
 #ifdef HAVE_OPENSSL
 	int error;
 	DEBUG { printf("call SSL_read\n"); fflush(stdout); }
-        rc = SSL_read(srv->ssl, inbuffer, bsiz - 1);
+        rc = SSL_read(srv->ssl, inbufferp, bsiz - (inbufferp - inbuffer) - 1);
 	DEBUG { printf("SSL_read: %d\n", rc); fflush(stdout); }
 	if (rc <= 0)
           switch (error = SSL_get_error(srv->ssl, rc))
@@ -604,22 +606,46 @@ nextinput:
 	    }
 #endif
 #ifdef HAVE_GNUTLS
-        rc = gnutls_record_recv(tls_session, CS inbuffer, bsiz - 1);
+      retry1:
+	DEBUG { printf("call gnutls_record_recv\n"); fflush(stdout); }
+        rc = gnutls_record_recv(tls_session, CS inbufferp, bsiz - (inbufferp - inbuffer) - 1);
+	if (rc < 0)
+	  {
+	  DEBUG { printf("gnutls_record_recv: %s\n", gnutls_strerror(rc)); fflush(stdout); }
+	  if (rc == GNUTLS_E_INTERRUPTED || rc == GNUTLS_E_AGAIN)
+	    goto retry1;
+	  printf("%s\n", gnutls_strerror(rc));
+	  srv->tls_active = FALSE;
+	  *inptr = 0;
+	  DEBUG { printf("go round\n"); fflush(stdout); }
+	  goto nextinput;
+	  }
+	DEBUG { printf("gnutls_record_recv: %d\n", rc); fflush(stdout); }
 #endif
         }
       else
 	{
 	DEBUG { printf("call read\n"); fflush(stdout); }
-	rc = read(srv->sock, inbuffer, bsiz);
+	rc = read(srv->sock, inbufferp, bsiz - (inbufferp - inbuffer) - 1);
 	DEBUG { printf("read: %d\n", rc); fflush(stdout); }
 	}
+
+        if (rc > 0) inbufferp[rc] = '\0';
+        if (rc <= 0 || strchr(inbufferp, '\n')) break;
+        inbufferp += rc;
+        if (inbufferp >= inbuffer + bsiz) {
+          printf("Input buffer overrun, need more than %d bytes input buffer\n", bsiz);
+          exit(73);
+        }
+        DEBUG { printf("read more\n"); }
+      }
       alarm(0);
 
       if (rc < 0)
 	{
 	if (errno == EINTR && sigalrm_seen && resp_optional)
 	  continue;	/* next scriptline */
-        printf("Read error %s\n", strerror(errno));
+        printf("Read error: %s\n", strerror(errno));
         exit(81);
 	}
       else if (rc == 0)
@@ -643,10 +669,7 @@ nextinput:
         exit(74);
         }
       else
-        {
-        inbuffer[rc] = 0;
         inptr = inbuffer;
-        }
       }
     DEBUG { printf("read: '%s'\n", inptr); fflush(stdout); }
 
@@ -702,6 +725,9 @@ nextinput:
         #ifdef HAVE_GNUTLS
 	  {
 	  int rc;
+	  fd_set rfd;
+	  struct timeval tv = { 0, 2000 };
+
 	  sigalrm_seen = FALSE;
 	  alarm(timeout);
 	  do {
@@ -711,6 +737,25 @@ nextinput:
 	  alarm(0);
 
 	  if (!srv->tls_active) printf("%s\n", gnutls_strerror(rc));
+
+	  /* look for an error on the TLS conn */
+	  FD_ZERO(&rfd);
+	  FD_SET(srv->sock, &rfd);
+	  if (select(srv->sock+1, &rfd, NULL, NULL, &tv) > 0)
+	    {
+	  retry2:
+	    DEBUG { printf("call gnutls_record_recv\n"); fflush(stdout); }
+	    rc = gnutls_record_recv(tls_session, CS inbuffer, bsiz - 1);
+	    if (rc < 0)
+	      {
+	      DEBUG { printf("gnutls_record_recv: %s\n", gnutls_strerror(rc)); fflush(stdout); }
+	      if (rc == GNUTLS_E_INTERRUPTED || rc == GNUTLS_E_AGAIN)
+		goto retry2;
+	      printf("%s\n", gnutls_strerror(rc));
+	      srv->tls_active = FALSE;
+	      }
+	    DEBUG { printf("gnutls_record_recv: %d\n", rc); fflush(stdout); }
+	    }
 	  }
         #endif
 
@@ -941,7 +986,7 @@ struct sockaddr_in6 s_in6;
 
 srv_ctx srv;
 
-unsigned char inbuffer[10240];
+unsigned char inbuffer[100 * 1024];
 unsigned char *inptr = inbuffer;
 
 *inptr = 0;   /* Buffer empty */