mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 14:51:11 +01:00
Code Issues Projects Releases Wiki Activity

Yet still more propagating of things that need to be was_router_added_t now.

Browse source 
svn:r17722
This commit is contained in:
Nick Mathewson 2008-12-22 05:21:49 +00:00
parent 98a376fab1
commit e36c7a74bd
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/or/dirserv.c
View file

@ -744,7 +744,7 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg)
} }
/** As dirserv_add_descriptor, but for an extrainfo_t <b>ei</b>. */ /** 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) dirserv_add_extrainfo(extrainfo_t *ei, const char **msg)
{ {
routerinfo_t *ri; routerinfo_t *ri;
@ -756,7 +756,7 @@ dirserv_add_extrainfo(extrainfo_t *ei, const char **msg)
if (!ri) { if (!ri) {
*msg = "No corresponding router descriptor for extra-info descriptor"; *msg = "No corresponding router descriptor for extra-info descriptor";
extrainfo_free(ei); 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 /* 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); MAX_EXTRAINFO_UPLOAD_SIZE);
*msg = "Extrainfo document was too large"; *msg = "Extrainfo document was too large";
extrainfo_free(ei); extrainfo_free(ei);
return -1; return ROUTER_BAD_EI;
} }
if ((r = routerinfo_incompatible_with_extrainfo(ri, ei, NULL, msg))) { if ((r = routerinfo_incompatible_with_extrainfo(ri, ei, NULL, msg))) {
extrainfo_free(ei); 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); router_add_extrainfo_to_routerlist(ei, msg, 0, 0);
return 2; return ROUTER_ADDED_SUCCESSFULLY;
} }
/** Remove all descriptors whose nicknames or fingerprints no longer /** Remove all descriptors whose nicknames or fingerprints no longer