Update supported protovers for prop350

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.

diff --git a/src/core/or/protover.c b/src/core/or/protover.c
index 175bfbdab0c5383bd48e6891b3c5cc91e8cbc9fe..1ac32bf06cb8542756bcaf8f9e26f2c16e95e5a9 100644 (file)
--- a/src/core/or/protover.c
+++ b/src/core/or/protover.c
@@ -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. */

diff --git a/src/test/test_protover.c b/src/test/test_protover.c
index 9d14fd678a3e622d0ff7bbcdda113aee410d7140..9a10cf649fec655cb952033fd0ed0b54101b5316 100644 (file)
--- a/src/test/test_protover.c
+++ b/src/test/test_protover.c
@@ -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));