mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.3.0'

Browse source
This commit is contained in:
Nick Mathewson 2017-02-27 11:03:25 -05:00
commit 1421f75331
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
changes/bug20711 Normal file
View file

@ -0,0 +1,7 @@
o Minor bugfixes (directory mirrors):
- Allow relays to use directory mirrors without a DirPort: these relays
need to be contacted over their ORPorts using a begindir connection.
Fixes bug 20711; bugfix on 0.2.8.2-alpha.
- Clarify the message logged when a remote relay is unexpectedly missing
an ORPort or DirPort: users were confusing this with a local port.
Fixes bug 20711; bugfix on 0.2.8.2-alpha.

22
src/or/directory.c
View file

@ -1067,6 +1067,7 @@ directory_must_use_begindir(const or_options_t *options)
/** Evaluate the situation and decide if we should use an encrypted
* "begindir-style" connection for this directory request.
* 0) If there is no DirPort, yes.
* 1) If or_port is 0, or it's a direct conn and or_port is firewalled
* or we're a dir mirror, no.
* 2) If we prefer to avoid begindir conns, and we're not fetching or
@ -1077,14 +1078,20 @@ directory_must_use_begindir(const or_options_t *options)
*/
static int
directory_command_should_use_begindir(const or_options_t *options,
const tor_addr_t *addr,
int or_port,
const tor_addr_t *or_addr, int or_port,
const tor_addr_t *dir_addr, int dir_port,
dir_indirection_t indirection,
const char **reason)
{
(void)dir_addr;
tor_assert(reason);
*reason = NULL;
/* Reasons why we must use begindir */
if (!dir_port) {
*reason = "(using begindir - directory with no DirPort)";
return 1; /* We don't know a DirPort -- must begindir. */
}
/* Reasons why we can't possibly use begindir */
if (!or_port) {
*reason = "directory with unknown ORPort";
@ -1097,7 +1104,7 @@ directory_command_should_use_begindir(const or_options_t *options,
}
if (indirection == DIRIND_ONEHOP) {
/* We're firewalled and want a direct OR connection */
if (!fascist_firewall_allows_address_addr(addr, or_port,
if (!fascist_firewall_allows_address_addr(or_addr, or_port,
FIREWALL_OR_CONNECTION, 0, 0)) {
*reason = "ORPort not reachable";
return 0;
@ -1189,7 +1196,10 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port,
* send our directory request)? */
const int use_begindir = directory_command_should_use_begindir(options,
&or_addr_port->addr, or_addr_port->port,
indirection, &begindir_reason);
&dir_addr_port->addr, dir_addr_port->port,
indirection,
&begindir_reason);
/* Will the connection go via a three-hop Tor circuit? Note that this
* is separate from whether it will use_begindir. */
const int anonymized_connection = dirind_is_anon(indirection);
@ -1234,9 +1244,9 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port,
if (!port || tor_addr_is_null(&addr)) {
static int logged_backtrace = 0;
log_warn(LD_DIR,
"Cannot make an outgoing %sconnection without %sPort.",
"Cannot make an outgoing %sconnection without a remote %sPort.",
use_begindir ? "begindir " : "",
use_begindir ? "an OR" : "a Dir");
use_begindir ? "OR" : "Dir");
if (!logged_backtrace) {
log_backtrace(LOG_INFO, LD_BUG, "Address came from");
logged_backtrace = 1;