[GNUnet-SVN] r22117 - in libmicrohttpd: . src/daemon

[gnunet]

Author: grothoff
Date: 2012-06-19 19:47:11 +0200 (Tue, 19 Jun 2012)
New Revision: 22117

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/configure.ac
   libmicrohttpd/src/daemon/connection.c
   libmicrohttpd/src/daemon/connection_https.c
   libmicrohttpd/src/daemon/daemon.c
   libmicrohttpd/src/daemon/digestauth.c
   libmicrohttpd/src/daemon/internal.c
   libmicrohttpd/src/daemon/internal.h
Log:
Mike Crowe sends this patch:

Change various uses of time(NULL) to new MHD_monotonic_time() function to
make timeouts immune to the system real time clock changing. Leave one call
to time(2) which continues to use the real time for the HTTP Date: header.

If clock_gettime does not support CLOCK_MONOTONIC then fall through to
calling time(NULL) instead. This will be problematic if clock_gettime
sometimes fails and sometimes succeeds but that shouldn't happen.

The autoconf magic was lifted from
http://lists.gnu.org/archive/html/autoconf/2010-08/msg00035.html



Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2012-06-19 17:44:15 UTC (rev 22116)
+++ libmicrohttpd/ChangeLog     2012-06-19 17:47:11 UTC (rev 22117)
@@ -1,3 +1,7 @@
+Tue Jun 19 19:44:53 CEST 2012
+       Change various uses of time(NULL) to new MHD_monotonic_time() function 
to
+       make timeouts immune to the system real time clock changing. -MC
+
 Tue Jun 12 21:35:00 CEST 2012
        Adding 451 status code. -CG
 

Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac  2012-06-19 17:44:15 UTC (rev 22116)
+++ libmicrohttpd/configure.ac  2012-06-19 17:47:11 UTC (rev 22117)
@@ -190,6 +190,9 @@
 AM_CONDITIONAL(USE_PRIVATE_PLIBC_H, test x$our_private_plibc_h = x1)    
 
 AC_CHECK_FUNCS(memmem)
+AC_SEARCH_LIBS([clock_gettime], [rt], [
+                               AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Have 
clock_gettime])
+])
 
 # IPv6
 AC_MSG_CHECKING(for IPv6)

Modified: libmicrohttpd/src/daemon/connection.c
===================================================================
--- libmicrohttpd/src/daemon/connection.c       2012-06-19 17:44:15 UTC (rev 
22116)
+++ libmicrohttpd/src/daemon/connection.c       2012-06-19 17:47:11 UTC (rev 
22117)
@@ -1786,7 +1786,7 @@
 int
 MHD_connection_handle_read (struct MHD_Connection *connection)
 {
-  connection->last_activity = time (NULL);
+  connection->last_activity = MHD_monotonic_time();
   if (connection->state == MHD_CONNECTION_CLOSED)
     return MHD_YES;
   /* make sure "read" has a reasonable number of bytes
@@ -1851,7 +1851,7 @@
 {
   struct MHD_Response *response;
   int ret;
-  connection->last_activity = time (NULL);
+  connection->last_activity = MHD_monotonic_time();
   while (1)
     {
 #if DEBUG_STATES
@@ -2372,7 +2372,7 @@
     }
   timeout = connection->connection_timeout;
   if ( (timeout != 0) &&
-       (timeout <= (time (NULL) - connection->last_activity)) )
+       (timeout <= (MHD_monotonic_time() - connection->last_activity)) )
     {
       MHD_connection_close (connection, 
MHD_REQUEST_TERMINATED_TIMEOUT_REACHED);
       return MHD_YES;

Modified: libmicrohttpd/src/daemon/connection_https.c
===================================================================
--- libmicrohttpd/src/daemon/connection_https.c 2012-06-19 17:44:15 UTC (rev 
22116)
+++ libmicrohttpd/src/daemon/connection_https.c 2012-06-19 17:47:11 UTC (rev 
22117)
@@ -47,7 +47,7 @@
 {
   int ret;
 
-  connection->last_activity = time (NULL);
+  connection->last_activity = MHD_monotonic_time();
   if (connection->state == MHD_TLS_CONNECTION_INIT)
     {
       ret = gnutls_handshake (connection->tls_session);
@@ -138,7 +138,7 @@
             __FUNCTION__, MHD_state_to_string (connection->state));
 #endif
   timeout = connection->connection_timeout;
-  if ( (timeout != 0) && (time (NULL) - timeout > connection->last_activity))
+  if ( (timeout != 0) && (MHD_monotonic_time() - timeout > 
connection->last_activity))
     MHD_connection_close (connection,
                          MHD_REQUEST_TERMINATED_TIMEOUT_REACHED);
   switch (connection->state)

Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c   2012-06-19 17:44:15 UTC (rev 22116)
+++ libmicrohttpd/src/daemon/daemon.c   2012-06-19 17:47:11 UTC (rev 22117)
@@ -546,7 +546,6 @@
   return MHD_YES;
 }
 
-
 /**
  * Main function of the thread that handles an individual
  * connection when MHD_USE_THREAD_PER_CONNECTION is set.
@@ -578,7 +577,7 @@
       tvp = NULL;
       if (timeout > 0)
        {
-         now = time (NULL);
+         now = MHD_monotonic_time();
          if (now - con->last_activity > timeout)
            tv.tv_sec = 0;
          else
@@ -938,7 +937,7 @@
   connection->addr_len = addrlen;
   connection->socket_fd = client_socket;
   connection->daemon = daemon;
-  connection->last_activity = time (NULL);
+  connection->last_activity = MHD_monotonic_time();
 
   /* set default connection handlers  */
   MHD_set_http_callbacks_ (connection);
@@ -1252,7 +1251,7 @@
     }
   if (!have_timeout)
     return MHD_NO;
-  now = time (NULL);
+  now = MHD_monotonic_time();
   if (earliest_deadline < now)
     *timeout = 0;
   else

Modified: libmicrohttpd/src/daemon/digestauth.c
===================================================================
--- libmicrohttpd/src/daemon/digestauth.c       2012-06-19 17:44:15 UTC (rev 
22116)
+++ libmicrohttpd/src/daemon/digestauth.c       2012-06-19 17:47:11 UTC (rev 
22117)
@@ -619,7 +619,7 @@
       
     /* 8 = 4 hexadecimal numbers for the timestamp */  
     nonce_time = strtoul(nonce + len - 8, (char **)NULL, 16);  
-    t = (uint32_t) time(NULL);    
+    t = (uint32_t) MHD_monotonic_time();    
     /*
      * First level vetting for the nonce validity if the timestamp
      * attached to the nonce exceeds `nonce_timeout' then the nonce is
@@ -751,7 +751,7 @@
   char nonce[HASH_MD5_HEX_LEN + 9];
 
   /* Generating the server nonce */  
-  calculate_nonce ((uint32_t) time(NULL),
+  calculate_nonce ((uint32_t) MHD_monotonic_time(),
                   connection->method,
                   connection->daemon->digest_auth_random,
                   connection->daemon->digest_auth_rand_size,

Modified: libmicrohttpd/src/daemon/internal.c
===================================================================
--- libmicrohttpd/src/daemon/internal.c 2012-06-19 17:44:15 UTC (rev 22116)
+++ libmicrohttpd/src/daemon/internal.c 2012-06-19 17:47:11 UTC (rev 22117)
@@ -157,4 +157,14 @@
   return wpos - val; /* = strlen(val) */
 }
 
+time_t MHD_monotonic_time(void)
+{
+#ifdef HAVE_CLOCK_GETTIME
+    struct timespec ts;
+    if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0)
+       return ts.tv_sec;
+#endif
+    return time(NULL);
+}
+
 /* end of internal.c */

Modified: libmicrohttpd/src/daemon/internal.h
===================================================================
--- libmicrohttpd/src/daemon/internal.h 2012-06-19 17:44:15 UTC (rev 22116)
+++ libmicrohttpd/src/daemon/internal.h 2012-06-19 17:47:11 UTC (rev 22117)
@@ -1057,5 +1057,11 @@
   (element)->next = NULL; \
   (element)->prev = NULL; } while (0)
 
+/**
+ * Equivalent to time(NULL) but tries to use some sort of monotonic
+ * clock that isn't affected by someone setting the system real time
+ * clock.
+ */
+time_t MHD_monotonic_time(void);
 
 #endif