X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fsrc%2Fclient.c;h=5b720a286220e268f9d445819c7a0a9e74343b8a;hb=5346d9dc34a1d219f341c296a8860b1fa5c05a7e;hp=3a6b4ad3db3222cc151bea2ae1133146d7abab79;hpb=059f2aced50773fa38661a5a30c54260aee4bf55;p=exim.git

diff --git a/test/src/client.c b/test/src/client.c
index 3a6b4ad3d..5b720a286 100644
--- a/test/src/client.c
+++ b/test/src/client.c
@@ -36,6 +36,9 @@ ripped from the openssl ocsp and s_client utilities. */
 #include <unistd.h>
 #include <utime.h>
 
+/* Set to TRUE to enable debug output */
+#define DEBUG if (FALSE)
+
 #ifdef AF_INET6
 #define HAVE_IPV6 1
 #endif
@@ -567,21 +570,67 @@ nextinput:
     if (*inptr == 0)   /* Refill input buffer */
       {
       alarm(timeout);
+      unsigned char *inbufferp = inbuffer;
+      for (;;) {
       if (srv->tls_active)
         {
-        #ifdef HAVE_OPENSSL
-        rc = SSL_read(srv->ssl, inbuffer, bsiz - 1);
-        #endif
-        #ifdef HAVE_GNUTLS
-        rc = gnutls_record_recv(tls_session, CS inbuffer, bsiz - 1);
-        #endif
+#ifdef HAVE_OPENSSL
+	int error;
+	DEBUG { printf("call SSL_read\n"); fflush(stdout); }
+        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))
+	    {
+	    case SSL_ERROR_ZERO_RETURN:
+	      break;
+	    case SSL_ERROR_SYSCALL:
+	      printf("%s\n", ERR_error_string(ERR_get_error(), NULL));
+	      rc = -1;
+	      break;
+	    case SSL_ERROR_SSL:
+	      printf("%s\nTLS terminated\n", ERR_error_string(ERR_get_error(), NULL));
+	      SSL_shutdown(srv->ssl);
+	      SSL_free(srv->ssl);
+	      srv->tls_active = FALSE;
+	      {	/* OpenSSL leaves it in restartsys mode */
+	      struct sigaction act = {.sa_handler = sigalrm_handler_flag, .sa_flags = 0};
+	      sigalrm_seen = 1;
+	      sigaction(SIGALRM, &act, NULL);
+	      }
+	      *inptr = 0;
+	      DEBUG { printf("go round\n"); fflush(stdout); }
+	      goto nextinput;
+	    default:
+	      printf("SSL error code %d\n", error);
+	    }
+#endif
+#ifdef HAVE_GNUTLS
+        rc = gnutls_record_recv(tls_session, CS inbufferp, bsiz - (inbufferp - inbuffer) - 1);
+#endif
         }
       else
-        rc = read(srv->sock, inbuffer, bsiz);
+	{
+	DEBUG { printf("call read\n"); fflush(stdout); }
+	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));
         exit(81);
 	}
@@ -591,6 +640,8 @@ nextinput:
           printf("Expected EOF read\n");
 	  continue;
 	  }
+	else if (resp_optional)
+	  continue;	/* next scriptline */
 	else
 	  {
 	  printf("Unexpected EOF read\n");
@@ -604,11 +655,9 @@ nextinput:
         exit(74);
         }
       else
-        {
-        inbuffer[rc] = 0;
         inptr = inbuffer;
-        }
       }
+    DEBUG { printf("read: '%s'\n", inptr); fflush(stdout); }
 
     lineptr = inptr;
     while (*inptr != 0 && *inptr != '\r' && *inptr != '\n') inptr++;
@@ -631,12 +680,19 @@ nextinput:
 	exit(79);
 	}
 
-    /* input matched script */
+    /* Input matched script.  Output the inputline, unless optional  */
+    DEBUG { printf("read matched\n"); fflush(stdout); }
+
+    if (!resp_optional)
+	printf("<<< %s\n", lineptr);
+    else
 
-    if (resp_optional)
-      goto nextinput;		/* consume inputline, not scriptline */
+    /* If there is further input after this line, consume inputline but not
+    scriptline in case there are several matching.  Nonmatches are dealt with
+    above. */
 
-    printf("<<< %s\n", lineptr);
+	if (*inptr != 0)
+	  goto nextinput;
 
     #ifdef HAVE_TLS
     if (srv->sent_starttls)
@@ -894,7 +950,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 */