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

dirvote: Reorder required protocol lists

Browse Source 
Use a consistent order, because the current order is going to trip
someone up eventually.

Preparation for 33285.
This commit is contained in:
teor 2020-02-12 22:06:11 +10:00
parent 78051c8808
commit 64bb6e622d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/feature/dirauth/dirvote.c
View File

@ -4623,10 +4623,10 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key,
v3_out->recommended_client_protocols =
tor_strdup(DIRVOTE_RECCOMEND_CLIENT_PROTO);
v3_out->required_client_protocols =
tor_strdup(DIRVOTE_REQUIRE_CLIENT_PROTO);
v3_out->required_relay_protocols =
tor_strdup(DIRVOTE_REQUIRE_RELAY_PROTO);
v3_out->required_client_protocols =
tor_strdup(DIRVOTE_REQUIRE_CLIENT_PROTO);
/* We are not allowed to vote to require anything we don't have. */
tor_assert(protover_all_supported(v3_out->required_relay_protocols, NULL));

6
src/feature/dirauth/dirvote.h
View File

@ -238,12 +238,12 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri,
"Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \
"Link=4 Microdesc=1-2 Relay=2"
#define DIRVOTE_REQUIRE_CLIENT_PROTO \
"Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \
"Link=4 Microdesc=1-2 Relay=2"
#define DIRVOTE_REQUIRE_RELAY_PROTO \
"Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \
"Link=3-4 Microdesc=1 Relay=1-2"
#define DIRVOTE_REQUIRE_CLIENT_PROTO \
"Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \
"Link=4 Microdesc=1-2 Relay=2"
#endif /* defined(DIRVOTE_PRIVATE) */