clean up the dirserv_add_multiple_descriptors() api

svn:r12630

diff --git a/src/or/directory.c b/src/or/directory.c
index 802cfedd0a237fb49f9bded3b609304c677af6d2..c23de6833124f1379734e35d9a209e1dbfe1e91f 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2704,12 +2704,12 @@ directory_handle_command_post(dir_connection_t *conn, const char *headers,
     if (r > 0)
       dirserv_get_directory(); /* rebuild and write to disk */
     switch (r) {
-      case -2:
       case -1:
-      case 1:
         log_notice(LD_DIRSERV,
-                   "Rejected router descriptor or extra-info from %s.",
-                   conn->_base.address);
+                   "Rejected router descriptor or extra-info from %s (\"%s\").",
+                   conn->_base.address, msg);
+        /* fall through */
+      case 1:
         /* malformed descriptor, or something wrong */
         write_http_status_line(conn, 400, msg);
         break;

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 3b4c8e2382ef978837e114311d43d69513f0ba52..a040b6263df1405cce1888e823cbdb50d2c73a8c 100644 (file)
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -627,7 +627,7 @@ dirserv_add_multiple_descriptors(const char *desc, uint8_t purpose,
  * Return 2 if descriptor is well-formed and accepted;
  *  1 if well-formed and accepted but origin should hear *msg;
  *  0 if well-formed but redundant with one we already have;
- * -1 if it looks vaguely like a router descriptor but rejected;
+ * -1 if it is rejected and origin should hear *msg;
  *
  * This function is only called when fresh descriptors are posted, not when
  * we re-load the cache.