aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-08-31 16:26:01 -0400
committerRoger Dingledine <arma@torproject.org>2009-08-31 16:26:01 -0400
commita225469ded4963e1197818c2fa58c079119cb309 (patch)
tree2aaf9850330fc425e584d33f0e0dd8b67eb914d9 /src/or/main.c
parent0bb59f1c38eef467a353faf1a30cf93b64209a27 (diff)
parent4c297f74f79e0e3d357d20bfc584eccc758d1fd8 (diff)
downloadtor-a225469ded4963e1197818c2fa58c079119cb309.tar.gz
tor-a225469ded4963e1197818c2fa58c079119cb309.zip
Merge branch 'maint-0.2.1'
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 5701727ad1..823e9b7940 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1240,17 +1240,26 @@ second_elapsed_callback(int fd, short event, void *args)
TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) {
/* every 20 minutes, check and complain if necessary */
routerinfo_t *me = router_get_my_routerinfo();
- if (me && !check_whether_orport_reachable())
+ if (me && !check_whether_orport_reachable()) {
log_warn(LD_CONFIG,"Your server (%s:%d) has not managed to confirm that "
"its ORPort is reachable. Please check your firewalls, ports, "
"address, /etc/hosts file, etc.",
me->address, me->or_port);
- if (me && !check_whether_dirport_reachable())
+ control_event_server_status(LOG_WARN,
+ "REACHABILITY_FAILED ORADDRESS=%s:%d",
+ me->address, me->or_port);
+ }
+
+ if (me && !check_whether_dirport_reachable()) {
log_warn(LD_CONFIG,
"Your server (%s:%d) has not managed to confirm that its "
"DirPort is reachable. Please check your firewalls, ports, "
"address, /etc/hosts file, etc.",
me->address, me->dir_port);
+ control_event_server_status(LOG_WARN,
+ "REACHABILITY_FAILED DIRADDRESS=%s:%d",
+ me->address, me->dir_port);
+ }
}
/** If more than this many seconds have elapsed, probably the clock