From: Tim Kosse <tim.kosse@filezilla-project.org>
Date: Fri, 10 May 2013 17:49:37 +0000 (+0200)
Subject: When retrying gnutls_record_send due to GNUTLS_E_AGAIN, also try passing null data... 
X-Git-Tag: gnutls_3_2_1~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f00445c35cf331064f4bae3b716ced5c8ba8aefc;p=thirdparty%2Fgnutls.git

When retrying gnutls_record_send due to GNUTLS_E_AGAIN, also try passing null data and length. Tests will fail after this patch until next patch is applied that fixes a bug in gnutls_record_send.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
---

diff --git a/tests/eagain-common.h b/tests/eagain-common.h
index c9aa0324eb..dac712b8b3 100644
--- a/tests/eagain-common.h
+++ b/tests/eagain-common.h
@@ -69,13 +69,9 @@ extern const char* side;
 #define HANDSHAKE(c, s) \
   HANDSHAKE_EXPECT(c,s,0,0)
 
-#define TRANSFER(c, s, msg, msglen, buf, buflen) \
-  do \
-    { \
-      side = "client"; \
-      ret = gnutls_record_send (c, msg, msglen); \
-    } \
-  while(ret == GNUTLS_E_AGAIN); \
+#define TRANSFER2(c, s, msg, msglen, buf, buflen, retry_send_with_null) \
+  side = "client"; \
+  ret = record_send_loop (c, msg, msglen, retry_send_with_null); \
   \
   if (ret < 0) fail ("client send error: %s\n", gnutls_strerror (ret)); \
   \
@@ -97,12 +93,8 @@ extern const char* side;
         { \
           transferred += ret; \
         } \
-      do \
-        { \
-          side = "server"; \
-          ns = gnutls_record_send (server, msg, msglen); \
-        } \
-      while (ns == GNUTLS_E_AGAIN); \
+      side = "server"; \
+      ns = record_send_loop (server, msg, msglen, retry_send_with_null); \
       if (ns < 0) fail ("server send error: %s\n", gnutls_strerror (ret)); \
       do \
         { \
@@ -127,12 +119,8 @@ extern const char* side;
               fail ("client: Transmitted data do not match\n"); \
             } \
           /* echo back */ \
-          do \
-            { \
-              side = "client"; \
-              ns = gnutls_record_send (client, buf, msglen); \
-            } \
-          while (ns == GNUTLS_E_AGAIN); \
+          side = "client"; \
+          ns = record_send_loop (client, buf, msglen, retry_send_with_null); \
           if (ns < 0) fail ("client send error: %s\n", gnutls_strerror (ret)); \
           transferred += ret; \
           if (debug) \
@@ -141,6 +129,10 @@ extern const char* side;
     } \
   while (transferred < 70000)
 
+#define TRANSFER(c, s, msg, msglen, buf, buflen) \
+  TRANSFER2(c, s, msg, msglen, buf, buflen, 0); \
+  TRANSFER2(c, s, msg, msglen, buf, buflen, 1)
+
 static char to_server[64*1024];
 static size_t to_server_len = 0;
 
@@ -293,3 +285,26 @@ inline static void reset_buffers(void)
   to_server_len = 0;
   to_client_len = 0;
 }
+
+inline static int record_send_loop(gnutls_session_t session, const void * data, size_t sizeofdata, int use_null_on_retry)
+{
+int ret;
+const void * retry_data;
+size_t retry_sizeofdata;
+
+  if( use_null_on_retry ) {
+      retry_data = 0;
+      retry_sizeofdata = 0;
+  }
+  else {
+      retry_data = data;
+      retry_sizeofdata = sizeofdata;
+  }
+
+  ret = gnutls_record_send( session, data, sizeofdata );
+  while( ret == GNUTLS_E_AGAIN ) {
+    ret = gnutls_record_send( session, retry_data, retry_sizeofdata );
+  }
+
+  return ret;
+}