stop troubling router operators with unapproved router connect attempts

but give the dirserver operator more information

svn:r1246

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 7610087e91c137410d7d6fd602375923c2c03aff..9f0f3b85cba54618181e4a4ac33b55b456929a66 100644 (file)
--- 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 6966f3fe4fe3fcf0b6384a37312b4f956ef8bad5..3540048faf3d9909a3b2142514ee1c2f60002dd0 100644 (file)
--- 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 bfd5935597d38a7fe9ada1610c43269e7afc0ded..f47d8295828137a7f08f9201ae4271f2ec205e05 100644 (file)
--- 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) {