[or-cvs] when we reject a rend descriptor, tell us where it came from.

[arma at seul.org]

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

Modified Files:
	directory.c 
Log Message:
when we reject a rend descriptor, tell us where it came from.


Index: directory.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/directory.c,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -p -d -r1.331 -r1.332
--- directory.c	27 Dec 2005 05:26:03 -0000	1.331
+++ directory.c	29 Dec 2005 04:43:24 -0000	1.332
@@ -1541,7 +1541,7 @@ directory_handle_command_post(connection
       case -2:
       case -1:
       case 1:
-        notice(LD_DIRSERV,"Rejected descriptor from %s.", origin);
+        notice(LD_DIRSERV,"Rejected router descriptor from %s.", origin);
         /* malformed descriptor, or something wrong */
         write_http_status_line(conn, 400, msg);
         break;
@@ -1555,10 +1555,12 @@ directory_handle_command_post(connection
 
   if (!strcmpstart(url,"/tor/rendezvous/publish")) {
     /* rendezvous descriptor post */
-    if (rend_cache_store(body, body_len) < 0)
+    if (rend_cache_store(body, body_len) < 0) {
+      notice(LD_DIRSERV,"Rejected rend descriptor from %s.", origin);
       write_http_status_line(conn, 400, "Invalid service descriptor rejected");
-    else
+    } else {
       write_http_status_line(conn, 200, "Service descriptor stored");
+    }
     goto done;
   }
 
@@ -1569,7 +1571,6 @@ directory_handle_command_post(connection
   tor_free(url);
   tor_free(origin);
   return 0;
-
 }
 
 /** Called when a dirserver receives data on a directory connection;