From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Thu, 7 Apr 2011 21:40:21 +0000 (+0200)
Subject: Avoid using gnutls_transport_set_global_errno() and use gnutls_transport_set_errno... 
X-Git-Tag: gnutls_2_99_0~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8abdca2c4b57e2eabcfd3e508975ec34d9dd33cd;p=thirdparty%2Fgnutls.git

Avoid using gnutls_transport_set_global_errno() and use gnutls_transport_set_errno() instead.
---

diff --git a/tests/eagain-common.h b/tests/eagain-common.h
index 0cb76eeefe..473e236c21 100644
--- a/tests/eagain-common.h
+++ b/tests/eagain-common.h
@@ -93,22 +93,22 @@ static char to_client[64*1024];
 static size_t to_client_len = 0;
 
 #ifdef RANDOMIZE
-#define RETURN_RND_EAGAIN() \
+#define RETURN_RND_EAGAIN(session) \
   static unsigned char rnd = 0; \
   if (rnd++ % 2 == 0) \
     { \
-      gnutls_transport_set_global_errno (EAGAIN); \
+      gnutls_transport_set_errno (session, EAGAIN); \
       return -1; \
     }
 #else
-#define RETURN_RND_EAGAIN()
+#define RETURN_RND_EAGAIN(session)
 #endif
 
 static ssize_t
 client_push (gnutls_transport_ptr_t tr, const void *data, size_t len)
 {
   size_t newlen;
-  RETURN_RND_EAGAIN();
+  RETURN_RND_EAGAIN(tr);
 
   len = min(len, sizeof(to_server)-to_server_len);
 
@@ -124,7 +124,7 @@ client_push (gnutls_transport_ptr_t tr, const void *data, size_t len)
 static ssize_t
 client_pull (gnutls_transport_ptr_t tr, void *data, size_t len)
 {
-  RETURN_RND_EAGAIN();
+  RETURN_RND_EAGAIN(tr);
 
   if (to_client_len == 0)
     {
@@ -151,7 +151,7 @@ static ssize_t
 server_pull (gnutls_transport_ptr_t tr, void *data, size_t len)
 {
   //success ("server_pull len %d has %d\n", len, to_server_len);
-  RETURN_RND_EAGAIN();
+  RETURN_RND_EAGAIN(tr);
 
   if (to_server_len == 0)
     {
@@ -178,7 +178,7 @@ static ssize_t
 server_push (gnutls_transport_ptr_t tr, const void *data, size_t len)
 {
   size_t newlen;
-  RETURN_RND_EAGAIN();
+  RETURN_RND_EAGAIN(tr);
 
 //  hexprint (data, len);
 
diff --git a/tests/mini-eagain-dtls.c b/tests/mini-eagain-dtls.c
index 9c2083734f..775fe0e5f2 100644
--- a/tests/mini-eagain-dtls.c
+++ b/tests/mini-eagain-dtls.c
@@ -82,6 +82,7 @@ doit (void)
   gnutls_transport_set_push_function (server, server_push);
   gnutls_transport_set_pull_function (server, server_pull);
   gnutls_transport_set_pull_timeout_function (server, server_pull_timeout_func);
+  gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t)server);
 
   /* Init client */
   gnutls_anon_allocate_client_credentials (&c_anoncred);
@@ -93,6 +94,7 @@ doit (void)
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
   gnutls_transport_set_pull_timeout_function (client, client_pull_timeout_func);
+  gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t)client);
 
   handshake = 1;
   HANDSHAKE(client, server);
diff --git a/tests/mini-eagain.c b/tests/mini-eagain.c
index 78314f0365..274e158d4a 100644
--- a/tests/mini-eagain.c
+++ b/tests/mini-eagain.c
@@ -82,6 +82,7 @@ doit (void)
   gnutls_dh_set_prime_bits (server, 1024);
   gnutls_transport_set_push_function (server, server_push);
   gnutls_transport_set_pull_function (server, server_pull);
+  gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t)server);
 
   /* Init client */
   gnutls_anon_allocate_client_credentials (&c_anoncred);
@@ -92,6 +93,7 @@ doit (void)
   gnutls_credentials_set (client, GNUTLS_CRD_ANON, c_anoncred);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
+  gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t)client);
 
   handshake = 1;
   HANDSHAKE(client, server);
diff --git a/tests/mini.c b/tests/mini.c
index c43552ada1..29554615e0 100644
--- a/tests/mini.c
+++ b/tests/mini.c
@@ -77,6 +77,7 @@ doit (void)
   gnutls_dh_set_prime_bits (server, 1024);
   gnutls_transport_set_push_function (server, server_push);
   gnutls_transport_set_pull_function (server, server_pull);
+  gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t)server);
 
   /* Init client */
   gnutls_anon_allocate_client_credentials (&c_anoncred);
@@ -85,6 +86,7 @@ doit (void)
   gnutls_credentials_set (client, GNUTLS_CRD_ANON, c_anoncred);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
+  gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t)client);
 
   HANDSHAKE(client, server);