mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-30 23:53:32 +01:00
Remove unused "ROUTER_ADDED_NOTIFY_GENERATOR" internal value
We already have a way to return a 400 response code along with a personalized message response for the uploader. Resolves ticket 22213.
This commit is contained in:
parent
466e27feae
commit
8f1ddf0cd2
4
changes/cleanup22213
Normal file
4
changes/cleanup22213
Normal file
@ -0,0 +1,4 @@
|
||||
o Code simplification and refactoring:
|
||||
- Remove unused "ROUTER_ADDED_NOTIFY_GENERATOR" internal value.
|
||||
Resolves ticket 22213.
|
||||
|
@ -4467,14 +4467,7 @@ directory_handle_command_post,(dir_connection_t *conn, const char *headers,
|
||||
conn->base_.address, &msg);
|
||||
tor_assert(msg);
|
||||
|
||||
if (r == ROUTER_ADDED_NOTIFY_GENERATOR) {
|
||||
/* 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) {
|
||||
if (r == ROUTER_ADDED_SUCCESSFULLY) {
|
||||
write_http_status_line(conn, 200, msg);
|
||||
} else if (WRA_WAS_OUTDATED(r)) {
|
||||
write_http_response_header_impl(conn, -1, NULL, NULL,
|
||||
|
@ -5331,8 +5331,6 @@ typedef enum {
|
||||
typedef enum was_router_added_t {
|
||||
/* Router was added successfully. */
|
||||
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
|
||||
* descriptor was found OR router descriptor was rejected because
|
||||
* it was incompatible with its extrainfo document. */
|
||||
|
@ -124,7 +124,7 @@ static int WRA_NEVER_DOWNLOADABLE(was_router_added_t s);
|
||||
*/
|
||||
static inline int
|
||||
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
|
||||
* was not added because it was either:
|
||||
|
Loading…
Reference in New Issue
Block a user