[or-cvs] r17722: {tor} Yet still more propagating of things that need to be was_rou (tor/trunk/src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-12-22 00:21:49 -0500 (Mon, 22 Dec 2008)
New Revision: 17722

Modified:
   tor/trunk/src/or/dirserv.c
Log:
Yet still more propagating of things that need to be was_router_added_t now.

Modified: tor/trunk/src/or/dirserv.c
===================================================================
--- tor/trunk/src/or/dirserv.c	2008-12-22 04:53:11 UTC (rev 17721)
+++ tor/trunk/src/or/dirserv.c	2008-12-22 05:21:49 UTC (rev 17722)
@@ -744,7 +744,7 @@
 }
 
 /** As dirserv_add_descriptor, but for an extrainfo_t <b>ei</b>. */
-static int
+static was_router_added_t
 dirserv_add_extrainfo(extrainfo_t *ei, const char **msg)
 {
   routerinfo_t *ri;
@@ -756,7 +756,7 @@
   if (!ri) {
     *msg = "No corresponding router descriptor for extra-info descriptor";
     extrainfo_free(ei);
-    return -1;
+    return ROUTER_BAD_EI;
   }
 
   /* If it's too big, refuse it now. Otherwise we'll cache it all over the
@@ -769,15 +769,15 @@
                MAX_EXTRAINFO_UPLOAD_SIZE);
     *msg = "Extrainfo document was too large";
     extrainfo_free(ei);
-    return -1;
+    return ROUTER_BAD_EI;
   }
 
   if ((r = routerinfo_incompatible_with_extrainfo(ri, ei, NULL, msg))) {
     extrainfo_free(ei);
-    return r < 0 ? 0 : -1;
+    return r < 0 ? ROUTER_WAS_NOT_NEW : ROUTER_BAD_EI;
   }
   router_add_extrainfo_to_routerlist(ei, msg, 0, 0);
-  return 2;
+  return ROUTER_ADDED_SUCCESSFULLY;
 }
 
 /** Remove all descriptors whose nicknames or fingerprints no longer