commit 64bf6b70a889ee53978d70a2efc3c2a08a088826 Author: teor (Tim Wilson-Brown) <teor2345@gmail.com> Date: Thu Jul 7 16:10:56 2016 +1000 Check that extend_info_from_router is never called on a client --- changes/bug19639 | 3 +++ src/or/router.c | 8 +++++--- src/or/routerlist.c | 2 +- src/or/routerlist.h | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/changes/bug19639 b/changes/bug19639 new file mode 100644 index 0000000..9dc7e62 --- /dev/null +++ b/changes/bug19639 @@ -0,0 +1,3 @@ + o Minor bugfixes (circuits): + - Make sure extend_info_from_router is only called on servers. + Fixes bug 19639; bugfix on 0.2.8.1-alpha. diff --git a/src/or/router.c b/src/or/router.c index a671591..f858fbe 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, diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 6ea9d8b..2fe8c3b 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1870,7 +1870,7 @@ router_picked_poor_directory_log(const routerstatus_t *rs) /* When iterating through the routerlist, can OR address/port preference * and reachability checks be skipped? */ -static int +int router_skip_or_reachability(const or_options_t *options, int try_ip_pref) { /* Servers always have and prefer IPv4. diff --git a/src/or/routerlist.h b/src/or/routerlist.h index 01f7644..9765ee7 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -58,6 +58,7 @@ const routerstatus_t *router_pick_trusteddirserver(dirinfo_type_t type, int flags); const routerstatus_t *router_pick_fallback_dirserver(dirinfo_type_t type, int flags); +int router_skip_or_reachability(const or_options_t *options, int try_ip_pref); int router_get_my_share_of_directory_requests(double *v3_share_out); void router_reset_status_download_failures(void); int routers_have_same_or_addrs(const routerinfo_t *r1, const routerinfo_t *r2);