diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-14 17:04:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-14 17:04:53 -0400 |
| commit | b97d9abd0940037b249a1ee56724dbfed904263b (patch) | |
| tree | 11f3d29871623f5e9baa4b6bf7e20874201da298 /src/or/router.c | |
| parent | 0588330c1d66960353c412812d1d073fdb37e310 (diff) | |
| parent | 1a9d19e9728c21ffa37f2b751df8e8e97c1835d3 (diff) | |
| download | tor-b97d9abd0940037b249a1ee56724dbfed904263b.tar.gz tor-b97d9abd0940037b249a1ee56724dbfed904263b.zip | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/or/router.c b/src/or/router.c index 4c5eb7a392..c15b9b236e 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -881,19 +881,14 @@ consider_testing_reachability(int test_or, int test_dir) void router_orport_found_reachable(void) { - if (!can_reach_or_port) { - routerinfo_t *me = router_get_my_routerinfo(); + routerinfo_t *me = router_get_my_routerinfo(); + if (!can_reach_or_port && me) { log_notice(LD_OR,"Self-testing indicates your ORPort is reachable from " "the outside. Excellent.%s", get_options()->_PublishServerDescriptor != NO_AUTHORITY ? " Publishing server descriptor." : ""); can_reach_or_port = 1; mark_my_descriptor_dirty(); - if (!me) { /* should never happen */ - log_warn(LD_BUG, "ORPort found reachable, but I have no routerinfo " - "yet. Failing to inform controller of success."); - return; - } control_event_server_status(LOG_NOTICE, "REACHABILITY_SUCCEEDED ORADDRESS=%s:%d", me->address, me->or_port); @@ -904,18 +899,13 @@ router_orport_found_reachable(void) void router_dirport_found_reachable(void) { - if (!can_reach_dir_port) { - routerinfo_t *me = router_get_my_routerinfo(); + routerinfo_t *me = router_get_my_routerinfo(); + if (!can_reach_dir_port && me) { log_notice(LD_DIRSERV,"Self-testing indicates your DirPort is reachable " "from the outside. Excellent."); can_reach_dir_port = 1; - if (!me || decide_to_advertise_dirport(get_options(), me->dir_port)) + if (decide_to_advertise_dirport(get_options(), me->dir_port)) mark_my_descriptor_dirty(); - if (!me) { /* should never happen */ - log_warn(LD_BUG, "DirPort found reachable, but I have no routerinfo " - "yet. Failing to inform controller of success."); - return; - } control_event_server_status(LOG_NOTICE, "REACHABILITY_SUCCEEDED DIRADDRESS=%s:%d", me->address, me->dir_port); |