diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-01-26 12:19:00 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-01-26 12:19:00 +0100 |
| commit | 1498b752527225dc3c4d3abfd297cf72dc0fef72 (patch) | |
| tree | 0a652c630885cc4469626804bc0fc0dfef5d4d56 /lib/gnutls_dtls.c | |
| parent | d8bdd3cc081f3235e22b77a75f99bd5425f03672 (diff) | |
| download | gnutls-1498b752527225dc3c4d3abfd297cf72dc0fef72.tar.gz | |
_dtls_timespec_sub_ms -> timespec_sub_ms
Diffstat (limited to 'lib/gnutls_dtls.c')
| -rw-r--r-- | lib/gnutls_dtls.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/lib/gnutls_dtls.c b/lib/gnutls_dtls.c index 198d5fbc5f..72b3562a62 100644 --- a/lib/gnutls_dtls.c +++ b/lib/gnutls_dtls.c @@ -38,14 +38,6 @@ #include <timespec.h> #include <algorithms.h> -/* returns a-b in ms */ -unsigned int -_dtls_timespec_sub_ms (struct timespec *a, struct timespec *b) -{ - return (a->tv_sec * 1000 + a->tv_nsec / (1000 * 1000) - - (b->tv_sec * 1000 + b->tv_nsec / (1000 * 1000))); -} - void _dtls_async_timer_delete (gnutls_session_t session) { @@ -248,7 +240,7 @@ unsigned int timeout; { /* if no retransmission is required yet just return */ - if (_dtls_timespec_sub_ms(&now, &session->internals.dtls.last_retransmit) < TIMER_WINDOW) + if (timespec_sub_ms(&now, &session->internals.dtls.last_retransmit) < TIMER_WINDOW) { gnutls_assert(); goto nb_timeout; @@ -279,7 +271,7 @@ unsigned int timeout; { timeout = TIMER_WINDOW; - diff = _dtls_timespec_sub_ms(&now, &session->internals.dtls.handshake_start_time); + diff = timespec_sub_ms(&now, &session->internals.dtls.handshake_start_time); if (diff >= session->internals.dtls.total_timeout_ms) { _gnutls_dtls_log("Session timeout: %u ms\n", diff); @@ -287,7 +279,7 @@ unsigned int timeout; goto end_flight; } - diff = _dtls_timespec_sub_ms(&now, &session->internals.dtls.last_retransmit); + diff = timespec_sub_ms(&now, &session->internals.dtls.last_retransmit); if (session->internals.dtls.flight_init == 0 || diff >= TIMER_WINDOW) { _gnutls_dtls_log ("DTLS[%p]: %sStart of flight transmission.\n", session, (session->internals.dtls.flight_init == 0)?"":"re-"); @@ -755,7 +747,7 @@ unsigned int diff; gettime(&now); - diff = _dtls_timespec_sub_ms(&now, &session->internals.dtls.last_retransmit); + diff = timespec_sub_ms(&now, &session->internals.dtls.last_retransmit); if (diff >= TIMER_WINDOW) return 0; else |