From e36c7a74bd8f2f01e425e4b1403b9b724292640c Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 22 Dec 2008 05:21:49 +0000 Subject: [PATCH] Yet still more propagating of things that need to be was_router_added_t now. svn:r17722 --- src/or/dirserv.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index de7401d4a8..399e63cc84 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -744,7 +744,7 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg) } /** As dirserv_add_descriptor, but for an extrainfo_t ei. */ -static int +static was_router_added_t dirserv_add_extrainfo(extrainfo_t *ei, const char **msg) { routerinfo_t *ri; @@ -756,7 +756,7 @@ dirserv_add_extrainfo(extrainfo_t *ei, const char **msg) 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 @@ dirserv_add_extrainfo(extrainfo_t *ei, const char **msg) 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