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/circuituse.c | |
| parent | 64f393d56f8ff58223db56f3b8e64f0074877616 (diff) | |
| download | tor-4c297f74f79e0e3d357d20bfc584eccc758d1fd8.tar tor-4c297f74f79e0e3d357d20bfc584eccc758d1fd8.tar.gz | |
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/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 6a54c3439..3acc0e9a7 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -724,17 +724,12 @@ circuit_testing_opened(origin_circuit_t *circ) static void circuit_testing_failed(origin_circuit_t *circ, int at_last_hop) { - routerinfo_t *me = router_get_my_routerinfo(); if (server_mode(get_options()) && check_whether_orport_reachable()) return; - if (!me) - return; log_info(LD_GENERAL, "Our testing circuit (to see if your ORPort is reachable) " "has failed. I'll try again later."); - control_event_server_status(LOG_WARN, "REACHABILITY_FAILED ORADDRESS=%s:%d", - me->address, me->or_port); /* These aren't used yet. */ (void)circ; |