diff options
author | Nick Mathewson <nickm@torproject.org> | 2009-09-01 15:59:40 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2009-09-01 15:59:40 -0400 |
commit | 1cda6f3e756c2e76d50d398726c5b1851556756f (patch) | |
tree | 6532b12c8f7cc40b7daecb810e49596c6f509647 /src/or/rendservice.c | |
parent | d76fd59a7ee49b36591708070d1e50d8a50c67d0 (diff) | |
parent | bddda9bbdb047e52652f7c6f9c2047df15a4e08e (diff) | |
download | tor-1cda6f3e756c2e76d50d398726c5b1851556756f.tar.gz tor-1cda6f3e756c2e76d50d398726c5b1851556756f.zip |
Merge commit 'origin/maint-0.2.1'
Diffstat (limited to 'src/or/rendservice.c')
-rw-r--r-- | src/or/rendservice.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index e8330094fb..7a970e490d 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -946,7 +946,7 @@ rend_service_introduce(origin_circuit_t *circuit, const char *request, /* Check timestamp. */ memcpy((char*)&ts, buf+1+v3_shift, sizeof(uint32_t)); v3_shift += 4; - ts = ntohl(ts); + ts = ntohl((uint32_t)ts); if ((now - ts) < -1 * REND_REPLAY_TIME_INTERVAL / 2 || (now - ts) > REND_REPLAY_TIME_INTERVAL / 2) { log_warn(LD_REND, "INTRODUCE2 cell is too %s. Discarding.", |