[or-cvs] when we refuse a router descriptor, log contactinfo and sou...

[arma@xxxxxxxx (Roger Dingledine)]

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

Modified Files:
	directory.c dirserv.c 
Log Message:
when we refuse a router descriptor, log contactinfo and source address.


Index: directory.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/directory.c,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -d -r1.224 -r1.225
--- directory.c	26 Apr 2005 18:52:15 -0000	1.224
+++ directory.c	2 May 2005 21:48:54 -0000	1.225
@@ -1035,6 +1035,7 @@
       case -1:
         /* malformed descriptor, or something wrong */
         write_http_status_line(conn, 400, msg?msg:"Malformed or unacceptable server descriptor");
+        log_fn(LOG_NOTICE,"Rejected descriptor published by '%s'.", conn->address);
         break;
       case 0:
         /* descriptor was well-formed but server has not been approved */

Index: dirserv.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/dirserv.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- dirserv.c	2 May 2005 21:22:31 -0000	1.160
+++ dirserv.c	2 May 2005 21:48:54 -0000	1.161
@@ -293,9 +293,9 @@
  * to NULL.
  *
  * Return 1 if descriptor is well-formed and accepted;
- * 0 if well-formed and server is unapproved but accepted;
- * -1 if well-formed but rejected;
- * -2 if not well-formed.
+ *  0 if well-formed and server is unapproved but accepted;
+ * -1 if it looks vaguely like a router descriptor but rejected;
+ * -2 if we can't find a router descriptor in *desc.
  */
 int
 dirserv_add_descriptor(const char **desc, const char **msg)
@@ -338,7 +338,7 @@
   /* Okay.  Now check whether the fingerprint is recognized. */
   r = dirserv_router_fingerprint_is_known(ri);
   if (r==-1) {
-    log_fn(LOG_WARN, "Known nickname '%s', wrong fingerprint. Not adding.", ri->nickname);
+    log_fn(LOG_WARN, "Known nickname '%s', wrong fingerprint. Not adding (ContactInfo '%s').", ri->nickname, ri->contact_info);
     *msg = "Rejected: There is already a verified server with this nickname and a different fingerprint.";
     routerinfo_free(ri);
     *desc = end;
@@ -357,23 +357,23 @@
   /* Is there too much clock skew? */
   now = time(NULL);
   if (ri->published_on > now+ROUTER_ALLOW_SKEW) {
-    log_fn(LOG_NOTICE, "Publication time for nickname '%s' is too far (%d minutes) in the future; possible clock skew. Not adding.",
-           ri->nickname, (int)((ri->published_on-now)/60));
+    log_fn(LOG_NOTICE, "Publication time for nickname '%s' is too far (%d minutes) in the future; possible clock skew. Not adding (ContactInfo '%s').",
+           ri->nickname, (int)((ri->published_on-now)/60), ri->contact_info);
     *msg = "Rejected: Your clock is set too far in the future, or your timezone is not correct.";
     routerinfo_free(ri);
     *desc = end;
     return -1;
   }
   if (ri->published_on < now-ROUTER_MAX_AGE) {
-    log_fn(LOG_NOTICE, "Publication time for router with nickname '%s' is too far (%d minutes) in the past. Not adding.",
-           ri->nickname, (int)((now-ri->published_on)/60));
+    log_fn(LOG_NOTICE, "Publication time for router with nickname '%s' is too far (%d minutes) in the past. Not adding (ContactInfo '%s').",
+           ri->nickname, (int)((now-ri->published_on)/60), ri->contact_info);
     *msg = "Rejected: Server is expired, or your clock is too far in the past, or your timezone is not correct.";
     routerinfo_free(ri);
     *desc = end;
     return -1;
   }
   if (dirserv_router_has_valid_address(ri) < 0) {
-    log_fn(LOG_NOTICE, "Router with nickname '%s' has invalid address '%s'. Not adding.", ri->nickname, ri->address);
+    log_fn(LOG_NOTICE, "Router with nickname '%s' has invalid address '%s'. Not adding (ContactInfo '%s').", ri->nickname, ri->address, ri->contact_info);
     *msg = "Rejected: Address is not an IP, or IP is a private address.";
     routerinfo_free(ri);
     *desc = end;