diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-07-26 19:31:15 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-07-26 19:31:15 -0400 |
| commit | f0488551e7be4e2d21a104903a86be993a240398 (patch) | |
| tree | 4f55f21fb5c390355fb6b46ffd749302d3082e56 /src/or/router.c | |
| parent | 48d7dfb92fba64dc0b9c26306f509c09a9246187 (diff) | |
| parent | 64bf6b70a889ee53978d70a2efc3c2a08a088826 (diff) | |
| download | tor-f0488551e7be4e2d21a104903a86be993a240398.tar.gz tor-f0488551e7be4e2d21a104903a86be993a240398.zip | |
Merge branch 'bug19639_squashed'
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/or/router.c b/src/or/router.c index a671591ad7..f858fbef2d 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1284,15 +1284,17 @@ decide_to_advertise_begindir(const or_options_t *options, } /** Allocate and return a new extend_info_t that can be used to build - * a circuit to or through the router <b>r</b>. Use the primary - * address of the router unless <b>for_direct_connect</b> is true, in - * which case the preferred address is used instead. */ + * a circuit to or through the router <b>r</b>. Uses the primary + * address of the router, so should only be called on a server. */ static extend_info_t * extend_info_from_router(const routerinfo_t *r) { tor_addr_port_t ap; tor_assert(r); + /* Make sure we don't need to check address reachability */ + tor_assert_nonfatal(!router_skip_or_reachability(get_options(), 0)); + router_get_prim_orport(r, &ap); return extend_info_new(r->nickname, r->cache_info.identity_digest, r->onion_pkey, r->onion_curve25519_pkey, |