X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/fd3cf789304c68aec6def76b24f61ea840c1a919..b4a37a77271a8f6efc887d68265eb7867eff6170:/test/src/client.c?ds=sidebyside diff --git a/test/src/client.c b/test/src/client.c index c143739d0..64b8203bf 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 #include +/* Set to TRUE to enable debug output */ +#define DEBUG if (FALSE) + #ifdef AF_INET6 #define HAVE_IPV6 1 #endif @@ -571,7 +574,9 @@ nextinput: { #ifdef HAVE_OPENSSL int error; + DEBUG { printf("call SSL_read\n"); fflush(stdout); } rc = SSL_read(srv->ssl, inbuffer, bsiz - 1); + DEBUG { printf("SSL_read: %d\n", rc); fflush(stdout); } if (rc <= 0) switch (error = SSL_get_error(srv->ssl, rc)) { @@ -592,24 +597,43 @@ nextinput: 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 + retry1: + 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 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 - rc = read(srv->sock, inbuffer, bsiz); + { + DEBUG { printf("call read\n"); fflush(stdout); } + rc = read(srv->sock, inbuffer, bsiz); + DEBUG { printf("read: %d\n", rc); fflush(stdout); } + } 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) @@ -638,6 +662,7 @@ nextinput: inptr = inbuffer; } } + DEBUG { printf("read: '%s'\n", inptr); fflush(stdout); } lineptr = inptr; while (*inptr != 0 && *inptr != '\r' && *inptr != '\n') inptr++; @@ -660,12 +685,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) @@ -684,6 +716,9 @@ nextinput: #ifdef HAVE_GNUTLS { int rc; + fd_set rfd; + struct timeval tv = { 0, 2000 }; + sigalrm_seen = FALSE; alarm(timeout); do { @@ -693,6 +728,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