nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 14:43:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'arma/cleanup22213'

Browse Source
This commit is contained in:
Nick Mathewson 2017-05-11 09:20:12 -04:00
commit 9905659573
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/cleanup22213 Normal file
View File

@ -0,0 +1,4 @@
o Code simplification and refactoring:
- Remove unused "ROUTER_ADDED_NOTIFY_GENERATOR" internal value.
Resolves ticket 22213.

9
src/or/directory.c
View File

@ -4467,14 +4467,7 @@ directory_handle_command_post,(dir_connection_t *conn, const char *headers,
conn->base_.address, &msg); conn->base_.address, &msg);
tor_assert(msg); tor_assert(msg);
if (r == ROUTER_ADDED_NOTIFY_GENERATOR) { if (r == ROUTER_ADDED_SUCCESSFULLY) {
/* Accepted with a message. */
log_info(LD_DIRSERV,
"Problematic router descriptor or extra-info from %s "
"(\"%s\").",
conn->base_.address, msg);
write_http_status_line(conn, 400, msg);
} else if (r == ROUTER_ADDED_SUCCESSFULLY) {
write_http_status_line(conn, 200, msg); write_http_status_line(conn, 200, msg);
} else if (WRA_WAS_OUTDATED(r)) { } else if (WRA_WAS_OUTDATED(r)) {
write_http_response_header_impl(conn, -1, NULL, NULL, write_http_response_header_impl(conn, -1, NULL, NULL,

2
src/or/or.h
View File

@ -5331,8 +5331,6 @@ typedef enum {
typedef enum was_router_added_t { typedef enum was_router_added_t {
/* Router was added successfully. */ /* Router was added successfully. */
ROUTER_ADDED_SUCCESSFULLY = 1, ROUTER_ADDED_SUCCESSFULLY = 1,
/* Router descriptor was added with warnings to submitter. */
ROUTER_ADDED_NOTIFY_GENERATOR = 0,
/* Extrainfo document was rejected because no corresponding router /* Extrainfo document was rejected because no corresponding router
* descriptor was found OR router descriptor was rejected because * descriptor was found OR router descriptor was rejected because
* it was incompatible with its extrainfo document. */ * it was incompatible with its extrainfo document. */

2
src/or/routerlist.h
View File

@ -124,7 +124,7 @@ static int WRA_NEVER_DOWNLOADABLE(was_router_added_t s);
*/ */
static inline int static inline int
WRA_WAS_ADDED(was_router_added_t s) { WRA_WAS_ADDED(was_router_added_t s) {
return s == ROUTER_ADDED_SUCCESSFULLY || s == ROUTER_ADDED_NOTIFY_GENERATOR; return s == ROUTER_ADDED_SUCCESSFULLY;
} }
/** Return true iff the outcome code in <b>s</b> indicates that the descriptor /** Return true iff the outcome code in <b>s</b> indicates that the descriptor
* was not added because it was either: * was not added because it was either: