summaryrefslogtreecommitdiff
path: root/test/src
diff options
context:
space:
mode:
authorHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2019-09-28 18:50:26 +0200
committerHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2019-09-28 21:55:18 +0200
commitbb71a66f55c3dd047dd5973c08365a967910f5e1 (patch)
tree8a2be66c5cbfa60c5db6ba7dc68ae39a5babb25f /test/src
parent2f06ffd252140e2cb71050aa8a9d45a75bc3437b (diff)
Testsuite: src/client.c: handle long lines read back from the server
Increase the buffer for reading data back from the server, and read at least until a '\n' appears in the input.
Diffstat (limited to 'test/src')
-rw-r--r--test/src/client.c23
1 files changed, 16 insertions, 7 deletions
diff --git a/test/src/client.c b/test/src/client.c
index 64b8203bf..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))
@@ -606,7 +608,7 @@ nextinput:
#ifdef HAVE_GNUTLS
retry1:
DEBUG { printf("call gnutls_record_recv\n"); fflush(stdout); }
- rc = gnutls_record_recv(tls_session, CS inbuffer, bsiz - 1);
+ 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); }
@@ -624,9 +626,19 @@ nextinput:
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)
@@ -657,10 +669,7 @@ nextinput:
exit(74);
}
else
- {
- inbuffer[rc] = 0;
inptr = inbuffer;
- }
}
DEBUG { printf("read: '%s'\n", inptr); fflush(stdout); }
@@ -977,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 */