diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-12 10:15:58 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-12 10:26:59 -0400 |
| commit | 5cbeb6080596c4442a19cffb56c1a68316b3014a (patch) | |
| tree | 043af62c2910bcc6797f47560ff2721c3ba11b80 /src/or/circuitbuild.c | |
| parent | 75c9ccd4f851bac6d32cb08ded557ac207bc8002 (diff) | |
| download | tor-5cbeb6080596c4442a19cffb56c1a68316b3014a.tar.gz tor-5cbeb6080596c4442a19cffb56c1a68316b3014a.zip | |
Fix directory self-testing logic
When I removed version_supports_begindir, I accidentally removed the
mechanism we had been using to make a directory cache self-test its
directory port. This caused bug 6815, which caused 6814 (both in
0.2.4.2-alpha).
To fix this bug, I'm replacing the "anonymized_connection" argument to
directory_initiate_command_* with an enumeration to say how indirectly
to connect to a directory server. (I don't want to reinstate the
"version_supports_begindir" argument as "begindir_ok" or anything --
these functions already take too many arguments.)
For safety, I made sure that passing 0 and 1 for 'indirection' gives
the same result as you would have gotten before -- just in case I
missed any 0s or 1s.
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index fe327cab45..4384e291f7 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -5479,7 +5479,7 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge) bridge->identity, DIR_PURPOSE_FETCH_SERVERDESC, ROUTER_PURPOSE_BRIDGE, - 0, "authority.z", NULL, 0, 0); + DIRIND_ONEHOP, "authority.z", NULL, 0, 0); tor_free(address); } |