mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2025-02-24 22:58:50 +01:00
Remove Support022HiddenServices
This has been already disabled in the directory consensus for a while; it didn't seem to break anything. Finally closes #7803.
This commit is contained in:
parent
a68b90fc7a
commit
b3bd7a736c
4 changed files with 8 additions and 22 deletions
5
changes/bug7803
Normal file
5
changes/bug7803
Normal file
|
@ -0,0 +1,5 @@
|
|||
o Removed features:
|
||||
- Tor clients no longer support connecting to hidden services running on
|
||||
Tor 0.2.2.x and earlier; the Support022HiddenServices option has been
|
||||
removed. (There shouldn't be any hidden services running these
|
||||
versions on the network.)
|
|
@ -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"),
|
||||
|
|
|
@ -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. */
|
||||
|
|
|
@ -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)) {
|
||||
|
|
Loading…
Add table
Reference in a new issue