diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-15 14:39:23 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-15 14:39:23 -0400 |
| commit | 49b5ad6b75f5f9e223a92033d9b3930e3e1d132f (patch) | |
| tree | 76b1f504e62e80c8d66f865f62742cf34f0160d8 /src/or | |
| parent | b440560b8bdd6034ddf94720bf9e3683aca68f72 (diff) | |
| parent | e05414d2411a5354dc43bde3a791938697a9799b (diff) | |
| download | tor-49b5ad6b75f5f9e223a92033d9b3930e3e1d132f.tar.gz tor-49b5ad6b75f5f9e223a92033d9b3930e3e1d132f.zip | |
Merge branch 'bug23533_031' into maint-0.3.1
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/channel.c | 2 | ||||
| -rw-r--r-- | src/or/channeltls.c | 2 | ||||
| -rw-r--r-- | src/or/rephist.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/or/channel.c b/src/or/channel.c index 17b2191b77..2970b96791 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -2696,7 +2696,7 @@ channel_do_open_actions(channel_t *chan) router_set_status(chan->identity_digest, 1); } else { /* only report it to the geoip module if it's not a known router */ - if (!router_get_by_id_digest(chan->identity_digest)) { + if (!connection_or_digest_is_known_relay(chan->identity_digest)) { if (channel_get_addr_if_possible(chan, &remote_addr)) { char *transport_name = NULL; if (chan->get_transport_name(chan, &transport_name) < 0) diff --git a/src/or/channeltls.c b/src/or/channeltls.c index f44e4fc8ea..c6a0bb21e9 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1823,7 +1823,7 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan) /** Warn when we get a netinfo skew with at least this value. */ #define NETINFO_NOTICE_SKEW 3600 if (labs(apparent_skew) > NETINFO_NOTICE_SKEW && - router_get_by_id_digest(chan->conn->identity_digest)) { + connection_or_digest_is_known_relay(chan->conn->identity_digest)) { int trusted = router_digest_is_trusted_dir(chan->conn->identity_digest); clock_skew_warning(TO_CONN(chan->conn), apparent_skew, trusted, LD_GENERAL, "NETINFO cell", "OR"); diff --git a/src/or/rephist.c b/src/or/rephist.c index 72a5cc5a9b..6a589379bb 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -947,9 +947,9 @@ rep_hist_record_mtbf_data(time_t now, int missing_means_down) base16_encode(dbuf, sizeof(dbuf), digest, DIGEST_LEN); if (missing_means_down && hist->start_of_run && - !router_get_by_id_digest(digest)) { + !connection_or_digest_is_known_relay(digest)) { /* We think this relay is running, but it's not listed in our - * routerlist. Somehow it fell out without telling us it went + * consensus. Somehow it fell out without telling us it went * down. Complain and also correct it. */ log_info(LD_HIST, "Relay '%s' is listed as up in rephist, but it's not in " |