diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2014-02-22 18:25:19 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2014-02-22 18:40:46 +0100 |
| commit | 33b9f8940a5fbd6d685bb05d32a0dc2bb78a40b0 (patch) | |
| tree | 8845e9ca2bdd148f7c60157bae949b9020fcc0e7 | |
| parent | 16bafa46bd53a327599b86010a18162e73d04f28 (diff) | |
| download | gnutls-33b9f8940a5fbd6d685bb05d32a0dc2bb78a40b0.tar.gz | |
combined initialization
| -rw-r--r-- | lib/gnutls_handshake.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c index 55f622abc6..efec41e62f 100644 --- a/lib/gnutls_handshake.c +++ b/lib/gnutls_handshake.c @@ -2506,13 +2506,12 @@ int gnutls_handshake(gnutls_session_t session) 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) + + session->internals.handshake_timeout_ms / 1000; } - if (session->internals.handshake_timeout_ms && - session->internals.handshake_endtime == 0) - session->internals.handshake_endtime = gnutls_time(0) + - session->internals.handshake_timeout_ms / 1000; - ret = _gnutls_epoch_get(session, session->security_parameters.epoch_next, |