[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/maint-0.4.6] protover: Fix merge forward from 035
commit a7fe37f1fa7821d0bdbeabe480df8aba7dc1fded
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date: Fri Nov 5 10:42:54 2021 -0400
protover: Fix merge forward from 035
Signed-off-by: David Goulet <dgoulet@xxxxxxxxxxxxxx>
---
src/core/or/protover.c | 22 ++++++----------
src/feature/dirauth/dirvote.h | 58 -------------------------------------------
src/test/test_protover.c | 8 +++---
3 files changed, 11 insertions(+), 77 deletions(-)
diff --git a/src/core/or/protover.c b/src/core/or/protover.c
index 8b307a8a2f..cb9a03d6ec 100644
--- a/src/core/or/protover.c
+++ b/src/core/or/protover.c
@@ -478,20 +478,13 @@ protover_get_supported_protocols(void)
* XXX: WARNING!
*/
-/*
- * NOTE: A keen observer will notice that "LinkAuth" is not recommended nor
- * required. This is due to the HAVE_WORKING_TOR_TLS_GET_TLSSECRETS define
- * that can either set "1" or "1,3" and so we can't enforce one or the other
- * due to this uncertainty on how tor was built.
- */
-
/** Return the recommended client protocols list that directory authorities
* put in the consensus. */
const char *
protover_get_recommended_client_protocols(void)
{
- return "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
- "Link=4 Microdesc=1-2 Relay=2";
+ return "Cons=2 Desc=2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 "
+ "Link=4-5 Microdesc=2 Relay=2";
}
/** Return the recommended relay protocols list that directory authorities
@@ -499,8 +492,8 @@ protover_get_recommended_client_protocols(void)
const char *
protover_get_recommended_relay_protocols(void)
{
- return "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
- "Link=4 Microdesc=1-2 Relay=2";
+ return "Cons=2 Desc=2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 "
+ "Link=4-5 LinkAuth=3 Microdesc=2 Relay=2";
}
/** Return the required client protocols list that directory authorities
@@ -508,8 +501,7 @@ protover_get_recommended_relay_protocols(void)
const char *
protover_get_required_client_protocols(void)
{
- return "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
- "Link=4 Microdesc=1-2 Relay=2";
+ return "Cons=2 Desc=2 Link=4 Microdesc=2 Relay=2";
}
/** Return the required relay protocols list that directory authorities
@@ -517,8 +509,8 @@ protover_get_required_client_protocols(void)
const char *
protover_get_required_relay_protocols(void)
{
- return "Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
- "Link=3-4 Microdesc=1 Relay=1-2";
+ return "Cons=2 Desc=2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 "
+ "Link=4-5 LinkAuth=3 Microdesc=2 Relay=2";
}
/*
diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h
index f9441773a7..81a7733e8c 100644
--- a/src/feature/dirauth/dirvote.h
+++ b/src/feature/dirauth/dirvote.h
@@ -260,64 +260,6 @@ char *networkstatus_get_detached_signatures(smartlist_t *consensuses);
STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri,
int consensus_method);
-/** The recommended relay protocols for this authority's votes.
- * Recommending a new protocol causes old tor versions to log a warning.
- */
-#define DIRVOTE_RECOMMEND_RELAY_PROTO \
- "Cons=2 " \
- "Desc=2 " \
- "DirCache=2 " \
- "HSDir=2 " \
- "HSIntro=4 " \
- "HSRend=2 " \
- "Link=4-5 " \
- "LinkAuth=3 " \
- "Microdesc=2 " \
- "Relay=2"
-
-/** The recommended client protocols for this authority's votes.
- * Recommending a new protocol causes old tor versions to log a warning.
- */
-#define DIRVOTE_RECOMMEND_CLIENT_PROTO \
- "Cons=2 " \
- "Desc=2 " \
- "DirCache=2 " \
- "HSDir=2 " \
- "HSIntro=4 " \
- "HSRend=2 " \
- "Link=4-5 " \
- "Microdesc=2 " \
- "Relay=2"
-
-/** The required relay protocols for this authority's votes.
- * WARNING: Requiring a new protocol causes old tor versions to shut down.
- * Requiring the wrong protocols can break the tor network.
- * See Proposal 303: When and how to remove support for protocol versions.
- */
-#define DIRVOTE_REQUIRE_RELAY_PROTO \
- "Cons=2 " \
- "Desc=2 " \
- "DirCache=2 " \
- "HSDir=2 " \
- "HSIntro=4 " \
- "HSRend=2 " \
- "Link=4-5 " \
- "LinkAuth=3 " \
- "Microdesc=2 " \
- "Relay=2"
-
-/** The required relay protocols for this authority's votes.
- * WARNING: Requiring a new protocol causes old tor versions to shut down.
- * Requiring the wrong protocols can break the tor network.
- * See Proposal 303: When and how to remove support for protocol versions.
- */
-#define DIRVOTE_REQUIRE_CLIENT_PROTO \
- "Cons=2 " \
- "Desc=2 " \
- "Link=4 " \
- "Microdesc=2 " \
- "Relay=2"
-
#endif /* defined(DIRVOTE_PRIVATE) */
#endif /* !defined(TOR_DIRVOTE_H) */
diff --git a/src/test/test_protover.c b/src/test/test_protover.c
index dd65f4bbf5..016cee7f15 100644
--- a/src/test/test_protover.c
+++ b/src/test/test_protover.c
@@ -606,10 +606,10 @@ test_protover_vote_roundtrip_ours(void *args)
(void) args;
const char *examples[] = {
protover_get_supported_protocols(),
- DIRVOTE_RECOMMEND_RELAY_PROTO,
- DIRVOTE_RECOMMEND_CLIENT_PROTO,
- DIRVOTE_REQUIRE_RELAY_PROTO,
- DIRVOTE_REQUIRE_CLIENT_PROTO,
+ protover_get_recommended_client_protocols(),
+ protover_get_recommended_relay_protocols(),
+ protover_get_required_client_protocols(),
+ protover_get_required_relay_protocols(),
};
unsigned u;
smartlist_t *votes = smartlist_new();
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits