tests print server or client side in debugging output.

7 files changed, 29 insertions, 9 deletions

diff --git a/tests/eagain-common.h b/tests/eagain-common.h
index 07d514885e..7c218361ee 100644
--- a/tests/eagain-common.h
+++ b/tests/eagain-common.h
@@ -1,5 +1,6 @@
 #define min(x,y) ((x)<(y)?(x):(y))
-//#define EAGAIN_DEBUG
+
+extern const char* side;
 
 #define HANDSHAKE_EXPECT(c, s, clierr, serverr) \
   sret = cret = GNUTLS_E_AGAIN; \
@@ -7,10 +8,12 @@
     { \
       if (cret == GNUTLS_E_AGAIN) \
         { \
+          side = "client"; \
           cret = gnutls_handshake (c); \
         } \
       if (sret == GNUTLS_E_AGAIN) \
         { \
+          side = "server"; \
           sret = gnutls_handshake (s); \
         } \
     } \
@@ -29,6 +32,7 @@
 #define TRANSFER(c, s, msg, msglen, buf, buflen) \
   do \
     { \
+      side = "client"; \
       ret = gnutls_record_send (c, msg, msglen); \
     } \
   while(ret == GNUTLS_E_AGAIN); \
@@ -39,6 +43,7 @@
     { \
       do \
         { \
+          side = "server"; \
           ret = gnutls_record_recv (s, buf, buflen); \
         } \
       while(ret == GNUTLS_E_AGAIN); \
@@ -54,12 +59,14 @@
         } \
       do \
         { \
+          side = "server"; \
           ns = gnutls_record_send (server, msg, msglen); \
         } \
       while (ns == GNUTLS_E_AGAIN); \
       if (ns < 0) fail ("server send error: %s\n", gnutls_strerror (ret)); \
       do \
         { \
+          side = "client"; \
           ret = gnutls_record_recv (client, buf, buflen); \
         } \
       while(ret == GNUTLS_E_AGAIN); \
@@ -82,6 +89,7 @@
           /* echo back */ \
           do \
             { \
+              side = "client"; \
               ns = gnutls_record_send (client, buf, msglen); \
             } \
           while (ns == GNUTLS_E_AGAIN); \
@@ -212,7 +220,7 @@ int ret;
     ret = 0; /* timeout */
 
 #ifdef EAGAIN_DEBUG
-  fprintf(stderr, "eagain: server_pull_timeout: %d\n", ret);
+  fprintf(stderr, "eagain: server_pull_timeout: %d (avail: cli %d, serv %d)\n", ret, (int)to_client_len, (int)to_server_len);
 #endif
 
   return ret;
@@ -228,7 +236,7 @@ int ret;
     ret = 0;
 
 #ifdef EAGAIN_DEBUG
-  fprintf(stderr, "eagain: client_pull_timeout: %d\n", ret);
+  fprintf(stderr, "eagain: client_pull_timeout: %d (avail: cli %d, serv %d)\n", ret, (int)to_client_len, (int)to_server_len);
 #endif
 
   return ret;
diff --git a/tests/mini-deflate.c b/tests/mini-deflate.c
index 40a2ea99e1..674338cbe2 100644
--- a/tests/mini-deflate.c
+++ b/tests/mini-deflate.c
@@ -35,10 +35,12 @@
 # include "eagain-common.h"
 # include "utils.h"
 
+const char* side = "";
+
 static void
 tls_log_func (int level, const char *str)
 {
-  fprintf (stderr, "|<%d>| %s", level, str);
+  fprintf (stderr, "%s|<%d>| %s", side, level, str);
 }
 
 # define MAX_BUF 6*1024
diff --git a/tests/mini-eagain-dtls.c b/tests/mini-eagain-dtls.c
index aeb2f44d74..f6f65e9821 100644
--- a/tests/mini-eagain-dtls.c
+++ b/tests/mini-eagain-dtls.c
@@ -34,10 +34,12 @@
 #define RANDOMIZE
 #include "eagain-common.h"
 
+const char* side = "";
+
 static void
 tls_log_func (int level, const char *str)
 {
-  fprintf (stderr, "|<%d>| %s", level, str);
+  fprintf (stderr, "%s|<%d>| %s", side, level, str);
 }
 
 static int handshake = 0;
diff --git a/tests/mini-eagain.c b/tests/mini-eagain.c
index 3aa1748e49..ac25ffb77d 100644
--- a/tests/mini-eagain.c
+++ b/tests/mini-eagain.c
@@ -35,10 +35,12 @@
 #define RANDOMIZE
 #include "eagain-common.h"
 
+const char* side = "";
+
 static void
 tls_log_func (int level, const char *str)
 {
-  fprintf (stderr, "|<%d>| %s", level, str);
+  fprintf (stderr, "%s|<%d>| %s", side, level, str);
 }
 
 static int handshake = 0;
diff --git a/tests/mini-x509-rehandshake.c b/tests/mini-x509-rehandshake.c
index 090ab8d48e..afad1bf38a 100644
--- a/tests/mini-x509-rehandshake.c
+++ b/tests/mini-x509-rehandshake.c
@@ -32,10 +32,12 @@
 #include "utils.h"
 #include "eagain-common.h"
 
+const char* side;
+
 static void
 tls_log_func (int level, const char *str)
 {
-  fprintf (stderr, "|<%d>| %s", level, str);
+  fprintf (stderr, "%s|<%d>| %s", side, level, str);
 }
 
 static unsigned char server_cert_pem[] =
diff --git a/tests/mini-x509.c b/tests/mini-x509.c
index dac5a5aa5c..5b581477ac 100644
--- a/tests/mini-x509.c
+++ b/tests/mini-x509.c
@@ -32,10 +32,12 @@
 #include "utils.h"
 #include "eagain-common.h"
 
+const char* side;
+
 static void
 tls_log_func (int level, const char *str)
 {
-  fprintf (stderr, "|<%d>| %s", level, str);
+  fprintf (stderr, "%s|<%d>| %s", side, level, str);
 }
 
 static unsigned char server_cert_pem[] =
diff --git a/tests/mini.c b/tests/mini.c
index eec1bcf9d6..fa0b37b2b8 100644
--- a/tests/mini.c
+++ b/tests/mini.c
@@ -33,10 +33,12 @@
 
 #include "utils.h"
 
+const char* side = "";
+
 static void
 tls_log_func (int level, const char *str)
 {
-  fprintf (stderr, "|<%d>| %s", level, str);
+  fprintf (stderr, "%s|<%d>| %s", side, level, str);
 }
 
 #define MAX_BUF 1024