diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-03-09 14:53:00 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-03-09 14:53:00 +0000 |
| commit | 30969421d3f6389fa985ae997c3a0969b3bfaf29 (patch) | |
| tree | e03fb07c1a0294dc6bfd3a9272878f55034d34ae | |
| parent | 416993afc1f82e3c9946950e6f5554ebe36d11bc (diff) | |
| download | tor-30969421d3f6389fa985ae997c3a0969b3bfaf29.tar.gz tor-30969421d3f6389fa985ae997c3a0969b3bfaf29.zip | |
stop troubling router operators with unapproved router connect attempts
but give the dirserver operator more information
svn:r1246
| -rw-r--r-- | src/or/connection_or.c | 2 | ||||
| -rw-r--r-- | src/or/dirserv.c | 3 | ||||
| -rw-r--r-- | src/or/routerlist.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 7610087e91..9f0f3b85cb 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -212,7 +212,7 @@ static int connection_tls_finish_handshake(connection_t *conn) { } router = router_get_by_link_pk(pk); if (!router) { - log_fn(LOG_WARN,"Unrecognized public key from peer '%s' (%s:%d). Closing.", + log_fn(LOG_INFO,"Unrecognized public key from peer '%s' (%s:%d). Closing.", nickname, conn->address, conn->port); crypto_free_pk_env(pk); return -1; diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 6966f3fe4f..3540048faf 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -229,7 +229,8 @@ dirserv_add_descriptor(const char **desc) if(r<1) { if(r==0) { char fp[FINGERPRINT_LEN+1]; - log_fn(LOG_WARN, "Unknown nickname %s. Not adding.", ri->nickname); + log_fn(LOG_WARN, "Unknown nickname %s (%s:%d). Not adding.", + ri->nickname, ri->address, ri->or_port); if (crypto_pk_get_fingerprint(ri->identity_pkey, fp) < 0) { log_fn(LOG_WARN, "Error computing fingerprint for %s", ri->nickname); } else { diff --git a/src/or/routerlist.c b/src/or/routerlist.c index bfd5935597..f47d829582 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -861,7 +861,7 @@ routerinfo_t *router_get_entry_from_string(const char *s, tok = find_first_by_keyword(tokens, K_BANDWIDTH); if (tok && bw_set) { - log_fn(LOG_WARN,"Rendundant bandwidth line"); + log_fn(LOG_WARN,"Redundant bandwidth line"); goto err; } else if (tok) { if (tok->n_args < 1) { |