Fix some other problems with GNU TLS and non blocking sockets.

diff --git a/src/ChangeLog b/src/ChangeLog
index b4f0e3afb97759a3aa77b47e6f9c075632daf332..d68ef7447e568ca885da1e17a0f88138a16f26ae 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-30  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+       * gnutls.c (wgnutls_read_timeout): Use the non blocking socket only for
+       `gnutls_record_recv'.  Set errno to ETIMEDOUT on a read timeout.
+

 2011-08-29  Giuseppe Scrivano  <gscrivano@gnu.org>
 
        * gnutls.c (wgnutls_read_timeout): New function.
 2011-08-29  Giuseppe Scrivano  <gscrivano@gnu.org>
 
        * gnutls.c (wgnutls_read_timeout): New function.

diff --git a/src/gnutls.c b/src/gnutls.c
index 064410737bcf0d857783a0bc43986e532c20050b..dfff00cf5bf6e0ffc950fc55f885ddc466b9b726 100644 (file)
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -139,17 +139,7 @@ wgnutls_read_timeout (int fd, char *buf, int bufsize, void *arg, double timeout)
 #ifdef F_GETFL
       flags = fcntl (fd, F_GETFL, 0);
       if (flags < 0)
 #ifdef F_GETFL
       flags = fcntl (fd, F_GETFL, 0);
       if (flags < 0)

-        return ret;
-
-      ret = fcntl (fd, F_SETFL, flags | O_NONBLOCK);
-      if (ret < 0)
-        return ret;
-#else
-      /* XXX: Assume it was blocking before.  */
-      const int one = 1;
-      ret = ioctl (fd, FIONBIO, &one);
-      if (ret < 0)
-        return ret;
+        return flags;

 #endif
       timer = ptimer_new ();
       if (timer == 0)
 #endif
       timer = ptimer_new ();
       if (timer == 0)


@@ -158,34 +148,56 @@ wgnutls_read_timeout (int fd, char *buf, int bufsize, void *arg, double timeout)
 
   do
     {
 
   do
     {

-      double timeout = timeout - ptimer_measure (timer);
-      if (timeout < 0)
+      double next_timeout = timeout - ptimer_measure (timer);
+      if (timeout && next_timeout < 0)

         break;
 
       ret = GNUTLS_E_AGAIN;
       if (timeout == 0 || gnutls_record_check_pending (ctx->session)
         break;
 
       ret = GNUTLS_E_AGAIN;
       if (timeout == 0 || gnutls_record_check_pending (ctx->session)

-          || select_fd (fd, timeout, WAIT_FOR_READ))
-        ret = gnutls_record_recv (ctx->session, buf, bufsize);
+          || select_fd (fd, next_timeout, WAIT_FOR_READ))
+        {
+          if (timeout)
+            {
+#ifdef F_GETFL
+              ret = fcntl (fd, F_SETFL, flags | O_NONBLOCK);
+              if (ret < 0)
+                return ret;
+#else
+              /* XXX: Assume it was blocking before.  */
+              const int one = 1;
+              ret = ioctl (fd, FIONBIO, &one);
+              if (ret < 0)
+                return ret;
+#endif
+            }

 
 

-      timed_out = timeout && ptimer_measure (timer) >= timeout;
-    }
-  while (ret == GNUTLS_E_INTERRUPTED || (ret == GNUTLS_E_AGAIN && !timed_out));
+          ret = gnutls_record_recv (ctx->session, buf, bufsize);

 
 

-  if (timeout)
-    {
-      int status;
-      ptimer_destroy (timer);
+          if (timeout)
+            {
+              int status;

 #ifdef F_GETFL
 #ifdef F_GETFL

-      status = fcntl (fd, F_SETFL, flags);
-      if (status < 0)
-        return status;
+              status = fcntl (fd, F_SETFL, flags);
+              if (status < 0)
+                return status;

 #else
 #else

-      const int zero = 0;
-      status = ioctl (fd, FIONBIO, &zero);
-      if (status < 0)
-        return status;
+              const int zero = 0;
+              status = ioctl (fd, FIONBIO, &zero);
+              if (status < 0)
+                return status;

 #endif
 #endif

+            }
+        }
+
+      timed_out = timeout && ptimer_measure (timer) >= timeout;

     }
     }

+  while (ret == GNUTLS_E_INTERRUPTED || (ret == GNUTLS_E_AGAIN && !timed_out));
+
+  if (timeout)
+    ptimer_destroy (timer);
+
+  if (timeout && timed_out && ret == GNUTLS_E_AGAIN)
+    errno = ETIMEDOUT;

 
   return ret;
 }
 
   return ret;
 }


@@ -259,7 +271,7 @@ wgnutls_peek (int fd, char *buf, int bufsize, void *arg)
         read = 0;
       else
         read = wgnutls_read_timeout (fd, buf + offset, bufsize - offset,
         read = 0;
       else
         read = wgnutls_read_timeout (fd, buf + offset, bufsize - offset,

-                                     ctx->session, opt.read_timeout);
+                                     ctx, opt.read_timeout);

       if (read < 0)
         {
           if (offset)
       if (read < 0)
         {
           if (offset)