the default should not be the notify the poster, unless something

more extreme happens. the default should be to be quiet unless
something more extreme happens.

at least, this doesn't generate complaints anymore. perhaps that
means it is working better? :)

svn:r17724

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 399e63cc8480e550078feef93e0de4372a95c920..598316fcda914cfd537238509b35cac932e3f11f 100644 (file)
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -568,13 +568,7 @@ authdir_wants_to_reject_router(routerinfo_t *ri, const char **msg,
 static int
 WRA_MORE_SEVERE(was_router_added_t a, was_router_added_t b)
 {
-  if (b == ROUTER_ADDED_SUCCESSFULLY) {
-    return 1;
-  } else if (b == ROUTER_ADDED_NOTIFY_GENERATOR) {
-    return !WRA_WAS_ADDED(a);
-  } else {
-    return a < b;
-  }
+  return a < b;
 }
 
 /** As for dirserv_add_descriptor(), but accepts multiple documents, and
@@ -595,7 +589,7 @@ dirserv_add_multiple_descriptors(const char *desc, uint8_t purpose,
   int general = purpose == ROUTER_PURPOSE_GENERAL;
   tor_assert(msg);
 
-  r=ROUTER_ADDED_NOTIFY_GENERATOR; /*Least severe return value. */
+  r=ROUTER_ADDED_SUCCESSFULLY; /*Least severe return value. */
 
   format_iso_time(time_buf, now);
   if (tor_snprintf(annotation_buf, sizeof(annotation_buf),

diff --git a/src/or/or.h b/src/or/or.h
index 06d1b8935598c0e73f463604908d2b8ff8eb5488..ffb989443872969bf76206a2ed13c1f7861f5b38 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4373,8 +4373,8 @@ void router_set_status(const char *digest, int up);
 
 /** Return value for router_add_to_routerlist() and dirserv_add_descriptor() */
 typedef enum was_router_added_t {
-  ROUTER_ADDED_SUCCESSFULLY = 0,
-  ROUTER_ADDED_NOTIFY_GENERATOR = 1,
+  ROUTER_ADDED_SUCCESSFULLY = 1,
+  ROUTER_ADDED_NOTIFY_GENERATOR = 0,
   ROUTER_BAD_EI = -1,
   ROUTER_WAS_NOT_NEW = -2,
   ROUTER_NOT_IN_CONSENSUS = -3,