reinitialize the handshake timers when gnutls_handshake() is called.

Conflicts:
	lib/gnutls_handshake.c
	lib/gnutls_state.c

diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index e835da1ac5e7e155b78ccdb0aa632291ea9d0ed7..481bfa899f4a4034f598ef6f48d440fd680eb073 100644 (file)
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -2450,6 +2450,12 @@ gnutls_handshake (gnutls_session_t session)
   if (session->internals.priorities.protocol.algorithms == 0)
     return gnutls_assert_val(GNUTLS_E_NO_PRIORITIES_WERE_SET);
 
+  if (STATE == STATE0) 
+    {
+      /* first call */
+      gettime(&session->internals.dtls.handshake_start_time);
+    }
+
   if (session->internals.handshake_timeout_ms && 
       session->internals.handshake_endtime == 0)
     session->internals.handshake_endtime = gnutls_time(0) + 

diff --git a/lib/gnutls_state.c b/lib/gnutls_state.c
index 3f768f7798ec57ee57d288238c18c2b107a639af..cfdf2df1f12b4575534de55144f680c9aabeaad7 100644 (file)
--- a/lib/gnutls_state.c
+++ b/lib/gnutls_state.c
@@ -269,7 +269,6 @@ _gnutls_handshake_internal_state_init (gnutls_session_t session)
   
   session->internals.dtls.hsk_read_seq = 0;
   session->internals.dtls.hsk_write_seq = 0;
-  gettime(&session->internals.dtls.handshake_start_time);
 }
 
 void