diff options
| author | Roger Dingledine <arma@torproject.org> | 2009-08-31 16:14:41 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2009-08-31 16:14:41 -0400 |
| commit | 4c297f74f79e0e3d357d20bfc584eccc758d1fd8 (patch) | |
| tree | 0327e49bcede6702ca16e1700cb30cb5f4eb3f56 /src/or/circuitbuild.c | |
| parent | 64f393d56f8ff58223db56f3b8e64f0074877616 (diff) | |
| download | tor-4c297f74f79e0e3d357d20bfc584eccc758d1fd8.tar.gz tor-4c297f74f79e0e3d357d20bfc584eccc758d1fd8.zip | |
Only send reachability status events on overall success/failure
We were telling the controller about CHECKING_REACHABILITY and
REACHABILITY_FAILED status events whenever we launch a testing
circuit or notice that one has failed. Instead, only tell the
controller when we want to inform the user of overall success or
overall failure. Bugfix on 0.1.2.6-alpha. Fixes bug 1075. Reported
by SwissTorExit.
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index d78981e09b..2d20efae3d 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -527,9 +527,16 @@ inform_testing_reachability(void) routerinfo_t *me = router_get_my_routerinfo(); if (!me) return 0; - if (me->dir_port) + control_event_server_status(LOG_NOTICE, + "CHECKING_REACHABILITY ORADDRESS=%s:%d", + me->address, me->or_port); + if (me->dir_port) { tor_snprintf(dirbuf, sizeof(dirbuf), " and DirPort %s:%d", me->address, me->dir_port); + control_event_server_status(LOG_NOTICE, + "CHECKING_REACHABILITY DIRADDRESS=%s:%d", + me->address, me->dir_port); + } log(LOG_NOTICE, LD_OR, "Now checking whether ORPort %s:%d%s %s reachable... " "(this may take up to %d minutes -- look for log " "messages indicating success)", @@ -537,6 +544,7 @@ inform_testing_reachability(void) me->dir_port ? dirbuf : "", me->dir_port ? "are" : "is", TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT/60); + return 1; } |