diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-17 11:52:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-11-17 11:52:10 -0500 |
| commit | b3bd7a736c7a54406c087bfaa2bae3dec03ec7bd (patch) | |
| tree | cc35cc4dc4bb41f98671156e892eb14e0f139811 /src/or | |
| parent | a68b90fc7af401220f11f4f9e39f08a8548a6957 (diff) | |
| download | tor-b3bd7a736c7a54406c087bfaa2bae3dec03ec7bd.tar.gz tor-b3bd7a736c7a54406c087bfaa2bae3dec03ec7bd.zip | |
Remove Support022HiddenServices
This has been already disabled in the directory consensus for a while;
it didn't seem to break anything.
Finally closes #7803.
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/config.c | 2 | ||||
| -rw-r--r-- | src/or/or.h | 3 | ||||
| -rw-r--r-- | src/or/rendclient.c | 20 |
3 files changed, 3 insertions, 22 deletions
diff --git a/src/or/config.c b/src/or/config.c index 4b8c6834e9..a0351d5f8d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -377,7 +377,7 @@ static config_var_t option_vars_[] = { OBSOLETE("StrictEntryNodes"), OBSOLETE("StrictExitNodes"), V(StrictNodes, BOOL, "0"), - V(Support022HiddenServices, AUTOBOOL, "auto"), + OBSOLETE("Support022HiddenServices"), V(TestSocks, BOOL, "0"), V(TokenBucketRefillInterval, MSEC_INTERVAL, "100 msec"), V(Tor2webMode, BOOL, "0"), diff --git a/src/or/or.h b/src/or/or.h index 5ebe7bfac3..8a9c1cf76e 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4229,9 +4229,6 @@ typedef struct { /** How long (seconds) do we keep a guard before picking a new one? */ int GuardLifetime; - /** Should we send the timestamps that pre-023 hidden services want? */ - int Support022HiddenServices; - } or_options_t; /** Persistent state for an onion router, as saved to disk. */ diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 5e5a09e41f..f351ae7161 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -130,16 +130,6 @@ rend_client_reextend_intro_circuit(origin_circuit_t *circ) return result; } -/** Return true iff we should send timestamps in our INTRODUCE1 cells */ -static int -rend_client_should_send_timestamp(void) -{ - if (get_options()->Support022HiddenServices >= 0) - return get_options()->Support022HiddenServices; - - return networkstatus_get_param(NULL, "Support022HiddenServices", 1, 0, 1); -} - /** Called when we're trying to connect an ap conn; sends an INTRODUCE1 cell * down introcirc if possible. */ @@ -251,14 +241,8 @@ rend_client_send_introduction(origin_circuit_t *introcirc, REND_DESC_COOKIE_LEN); v3_shift += 2+REND_DESC_COOKIE_LEN; } - if (rend_client_should_send_timestamp()) { - uint32_t now = (uint32_t)time(NULL); - now += 300; - now -= now % 600; - set_uint32(tmp+v3_shift+1, htonl(now)); - } else { - set_uint32(tmp+v3_shift+1, 0); - } + /* Once this held a timestamp. */ + set_uint32(tmp+v3_shift+1, 0); v3_shift += 4; } /* if version 2 only write version number */ else if (entry->parsed->protocols & (1<<2)) { |