diff options
| author | Roger Dingledine <arma@torproject.org> | 2009-09-16 20:45:01 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2009-09-16 20:45:01 -0400 |
| commit | 7d838971dd2dd754cc49ac68f8958529680a569d (patch) | |
| tree | b535b8b43eeefbc34e55948e99e9b57ffe25a7f6 | |
| parent | 9eb5edc0935939cc5aae2b382a9cfa324a476ef5 (diff) | |
| parent | 995606a7e199c1e4cef42b5ba9198c0d891773af (diff) | |
| download | tor-7d838971dd2dd754cc49ac68f8958529680a569d.tar.gz tor-7d838971dd2dd754cc49ac68f8958529680a569d.zip | |
Merge commit 'karsten/no-time-maint-0.2.1'
| -rw-r--r-- | src/or/rendservice.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 71cf762b6f..7ae6009958 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -921,7 +921,7 @@ rend_service_introduce(origin_circuit_t *circuit, const char *request, len = r; if (*buf == 3) { /* Version 3 INTRODUCE2 cell. */ - time_t ts = 0, now = time(NULL); + time_t ts = 0; v3_shift = 1; auth_type = buf[1]; switch (auth_type) { @@ -1100,7 +1100,7 @@ rend_service_introduce(origin_circuit_t *circuit, const char *request, circ_needs_uptime = rend_service_requires_uptime(service); /* help predict this next time */ - rep_hist_note_used_internal(time(NULL), circ_needs_uptime, 1); + rep_hist_note_used_internal(now, circ_needs_uptime, 1); /* Launch a circuit to alice's chosen rendezvous point. */ @@ -1136,7 +1136,7 @@ rend_service_introduce(origin_circuit_t *circuit, const char *request, launched->build_state->pending_final_cpath = cpath = tor_malloc_zero(sizeof(crypt_path_t)); cpath->magic = CRYPT_PATH_MAGIC; - launched->build_state->expiry_time = time(NULL) + MAX_REND_TIMEOUT; + launched->build_state->expiry_time = now + MAX_REND_TIMEOUT; cpath->dh_handshake_state = dh; dh = NULL; |