summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-05-27 17:43:43 +0000
committerRoger Dingledine <arma@torproject.org>2005-05-27 17:43:43 +0000
commit4855990d378212d433f65ff960391ae56e5e1365 (patch)
treefbd2efa278c19cab73692d2b825369cb471d5301
parentfc83c5f16209cf96742ba8a2ae5d15ad5fc7e71a (diff)
downloadtor-0.1.0.13.tar.gz
tor-0.1.0.13.zip
svn:r4304
-rw-r--r--src/or/directory.c2
-rw-r--r--src/or/main.c8
-rw-r--r--src/or/router.c6
3 files changed, 8 insertions, 8 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index fcea980ead..32ed70ab0d 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -664,7 +664,7 @@ connection_dir_client_reached_eof(connection_t *conn)
if (!reason) reason = tor_strdup("[no reason given]");
log_fn(LOG_DEBUG,
- "Received response from directory servers '%s': %d \"%s\"",
+ "Received response from directory server '%s': %d \"%s\"",
conn->address, status_code, reason);
if (date_header > 0) {
diff --git a/src/or/main.c b/src/or/main.c
index f0818c960d..ecda5691a8 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -818,11 +818,11 @@ static void second_elapsed_callback(int fd, short event, void *args)
/* every 20 minutes, check and complain if necessary */
routerinfo_t *me = router_get_my_routerinfo();
if (!check_whether_orport_reachable())
- log_fn(LOG_WARN,"Your server (%s:%d) has not managed to confirm that its ORPort is reachable. Please check your firewalls, ports, address, etc.",
- me ? me->address : options->Address, options->ORPort);
+ log(LOG_WARN,"Your server (%s:%d) has not managed to confirm that its ORPort is reachable. Please check your firewalls, ports, address, etc.",
+ me ? me->address : options->Address, options->ORPort);
if (!check_whether_dirport_reachable())
- log_fn(LOG_WARN,"Your server (%s:%d) has not managed to confirm that its DirPort is reachable. Please check your firewalls, ports, address, etc.",
- me ? me->address : options->Address, options->DirPort);
+ log(LOG_WARN,"Your server (%s:%d) has not managed to confirm that its DirPort is reachable. Please check your firewalls, ports, address, etc.",
+ me ? me->address : options->Address, options->DirPort);
}
/* if more than 100s have elapsed, probably the clock jumped: doesn't count. */
diff --git a/src/or/router.c b/src/or/router.c
index 8cd0a1fd23..6bcc678d52 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -405,7 +405,7 @@ void consider_testing_reachability(void) {
if (me) {
directory_initiate_command_router(me, DIR_PURPOSE_FETCH_DIR, 1, NULL, NULL, 0);
} else {
- log_fn(LOG_NOTICE,"Delaying checking DirPort reachability; can't build descriptor.");
+ log(LOG_NOTICE,"Delaying checking DirPort reachability; can't build descriptor.");
}
}
}
@@ -414,7 +414,7 @@ void consider_testing_reachability(void) {
void router_orport_found_reachable(void) {
if (!can_reach_or_port) {
if (!clique_mode(get_options()))
- log_fn(LOG_NOTICE,"Your ORPort is reachable from the outside. Excellent. Publishing server descriptor.");
+ log(LOG_NOTICE,"Your ORPort is reachable from the outside. Excellent. Publishing server descriptor.");
can_reach_or_port = 1;
consider_publishable_server(time(NULL), 1);
}
@@ -423,7 +423,7 @@ void router_orport_found_reachable(void) {
/** Annotate that we found our DirPort reachable. */
void router_dirport_found_reachable(void) {
if (!can_reach_dir_port) {
- log_fn(LOG_NOTICE,"Your DirPort is reachable from the outside. Excellent.");
+ log(LOG_NOTICE,"Your DirPort is reachable from the outside. Excellent.");
can_reach_dir_port = 1;
}
}