nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-19 20:46:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update supported protovers for prop350

Browse Source 
Relay=1 is no longer supported; it corresponds to TAP.

Microdesc=3 and Desc=3 are now supported; they correspond to the ability to
handle (micro)descriptors without TAP onion keys.
This commit is contained in:
Nick Mathewson 2024-06-24 19:53:50 -04:00
parent ff66aa306b
commit 9466cc9fdc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/or/protover.c
View File

@ -389,7 +389,7 @@ protocol_list_supports_protocol_or_later(const char *list,
/* All protocol version that this relay version supports. */
#define PR_CONFLUX_V "1"
#define PR_CONS_V "1-2"
#define PR_DESC_V "1-2"
#define PR_DESC_V "1-3"
#define PR_DIRCACHE_V "2"
#define PR_FLOWCTRL_V "1-2"
#define PR_HSDIR_V "2"
@ -401,9 +401,9 @@ protocol_list_supports_protocol_or_later(const char *list,
#else
#define PR_LINKAUTH_V "3"
#endif
#define PR_MICRODESC_V "1-2"
#define PR_MICRODESC_V "1-3"
#define PR_PADDING_V "2"
#define PR_RELAY_V "1-4"
#define PR_RELAY_V "2-4"
/** Return the string containing the supported version for the given protocol
* type. */

4
src/test/test_protover.c
View File

@ -329,7 +329,7 @@ test_protover_supports_version(void *arg)
* headers. */
#define PROTOVER_LINKAUTH_V1 1
#define PROTOVER_LINKAUTH_V2 2
#define PROTOVER_RELAY_V1 1
#define PROTOVER_RELAY_V2 2
/* Deprecated HSIntro versions */
#define PROTOVER_HS_INTRO_DEPRECATED_1 1
@ -397,7 +397,7 @@ test_protover_supported_protocols(void *arg)
/* Relay protovers do not appear anywhere in the code. */
tt_assert(protocol_list_supports_protocol(supported_protocols,
PRT_RELAY,
PROTOVER_RELAY_V1));
PROTOVER_RELAY_V2));
tt_assert(protocol_list_supports_protocol(supported_protocols,
PRT_RELAY,
PROTOVER_RELAY_EXTEND2));