summaryrefslogtreecommitdiff
path: root/src/core/or/protover.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/or/protover.c')
-rw-r--r--src/core/or/protover.c22
1 files changed, 7 insertions, 15 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";
}
/*