[or-cvs] stop troubling router operators with unapproved router conn...

[arma@seul.org (Roger Dingledine)]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or

Modified Files:
	connection_or.c dirserv.c routerlist.c 
Log Message:
stop troubling router operators with unapproved router connect attempts
but give the dirserver operator more information


Index: connection_or.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_or.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- connection_or.c	6 Mar 2004 01:43:37 -0000	1.86
+++ connection_or.c	9 Mar 2004 14:53:00 -0000	1.87
@@ -212,7 +212,7 @@
   }
   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;

Index: dirserv.c
===================================================================
RCS file: /home/or/cvsroot/src/or/dirserv.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- dirserv.c	8 Mar 2004 00:15:40 -0000	1.26
+++ dirserv.c	9 Mar 2004 14:53:00 -0000	1.27
@@ -229,7 +229,8 @@
   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 {

Index: routerlist.c
===================================================================
RCS file: /home/or/cvsroot/src/or/routerlist.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- routerlist.c	7 Mar 2004 23:50:15 -0000	1.32
+++ routerlist.c	9 Mar 2004 14:53:00 -0000	1.33
@@ -861,7 +861,7 @@
   
   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) {