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

Renaming ROUTER_WAS_NOT_NEW to ROUTER_IS_ALREADY_KNOWN.

Browse source
This commit is contained in:
rl1987 2014-11-11 20:56:40 +02:00
parent f9d73eea9c
commit a6520ed537
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/or/dirserv.c
View file

@ -512,7 +512,7 @@ dirserv_add_multiple_descriptors(const char *desc, uint8_t purpose,
if (!n_parsed) { if (!n_parsed) {
*msg = "No descriptors found in your POST."; *msg = "No descriptors found in your POST.";
if (WRA_WAS_ADDED(r)) if (WRA_WAS_ADDED(r))
r = ROUTER_WAS_NOT_NEW; r = ROUTER_IS_ALREADY_KNOWN;
} else { } else {
*msg = "(no message)"; *msg = "(no message)";
} }
@ -574,7 +574,7 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source)
ri->cache_info.signed_descriptor_body, ri->cache_info.signed_descriptor_body,
ri->cache_info.signed_descriptor_len, *msg); ri->cache_info.signed_descriptor_len, *msg);
routerinfo_free(ri); routerinfo_free(ri);
return ROUTER_WAS_NOT_NEW; return ROUTER_IS_ALREADY_KNOWN;
} }
/* Make a copy of desc, since router_add_to_routerlist might free /* Make a copy of desc, since router_add_to_routerlist might free
@ -646,7 +646,7 @@ dirserv_add_extrainfo(extrainfo_t *ei, const char **msg)
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 ? ROUTER_WAS_NOT_NEW : ROUTER_BAD_EI; return r < 0 ? ROUTER_IS_ALREADY_KNOWN : ROUTER_BAD_EI;
} }
router_add_extrainfo_to_routerlist(ei, msg, 0, 0); router_add_extrainfo_to_routerlist(ei, msg, 0, 0);
return ROUTER_ADDED_SUCCESSFULLY; return ROUTER_ADDED_SUCCESSFULLY;

2
src/or/or.h
View file

@ -5008,7 +5008,7 @@ typedef enum was_router_added_t {
* it was incompatible with its extrainfo document. */ * it was incompatible with its extrainfo document. */
ROUTER_BAD_EI = -1, ROUTER_BAD_EI = -1,
/* Router descriptor was rejected because it is already known. */ /* Router descriptor was rejected because it is already known. */
ROUTER_WAS_NOT_NEW = -2, ROUTER_IS_ALREADY_KNOWN = -2,
/* General purpose router was rejected, because it was not listed /* General purpose router was rejected, because it was not listed
* in consensus. */ * in consensus. */
ROUTER_NOT_IN_CONSENSUS = -3, ROUTER_NOT_IN_CONSENSUS = -3,

4
src/or/routerlist.c
View file

@ -3376,7 +3376,7 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg,
router_describe(router)); router_describe(router));
*msg = "Router descriptor was not new."; *msg = "Router descriptor was not new.";
routerinfo_free(router); routerinfo_free(router);
return ROUTER_WAS_NOT_NEW; return ROUTER_IS_ALREADY_KNOWN;
} }
} }
@ -3461,7 +3461,7 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg,
&routerlist->desc_store); &routerlist->desc_store);
routerlist_insert_old(routerlist, router); routerlist_insert_old(routerlist, router);
*msg = "Router descriptor was not new."; *msg = "Router descriptor was not new.";
return ROUTER_WAS_NOT_NEW; return ROUTER_IS_ALREADY_KNOWN;
} else { } else {
/* Same key, and either new, or listed in the consensus. */ /* Same key, and either new, or listed in the consensus. */
log_debug(LD_DIR, "Replacing entry for router %s", log_debug(LD_DIR, "Replacing entry for router %s",

2
src/or/routerlist.h
View file

@ -118,7 +118,7 @@ WRA_WAS_ADDED(was_router_added_t s) {
static INLINE int WRA_WAS_OUTDATED(was_router_added_t s) static INLINE int WRA_WAS_OUTDATED(was_router_added_t s)
{ {
return (s == ROUTER_WAS_TOO_OLD || return (s == ROUTER_WAS_TOO_OLD ||
s == ROUTER_WAS_NOT_NEW || s == ROUTER_IS_ALREADY_KNOWN ||
s == ROUTER_NOT_IN_CONSENSUS || s == ROUTER_NOT_IN_CONSENSUS ||
s == ROUTER_NOT_IN_CONSENSUS_OR_NETWORKSTATUS); s == ROUTER_NOT_IN_CONSENSUS_OR_NETWORKSTATUS);
} }