aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-03-04 12:03:18 -0500
committerNick Mathewson <nickm@torproject.org>2014-03-04 12:03:18 -0500
commit496fe685fddcf6f914819df053856621c3090c33 (patch)
tree891d86d05d596b5c950a8a4e310995825b19948e /src/or
parentab225aaf28d7a25a58b5f11f1c59ded80570b594 (diff)
downloadtor-496fe685fddcf6f914819df053856621c3090c33.tar
tor-496fe685fddcf6f914819df053856621c3090c33.tar.gz
Include v3 in documented 'protocols' in rend_service_descriptor_t
Also make it unsigned and document that it's for INTRODUCE cell versions. Fixes 9099; bugfix on 0.2.1.5-alpha, which introduced the v3 protocol.
Diffstat (limited to 'src/or')
-rw-r--r--src/or/or.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 478b47849..e49a3b08a 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4838,9 +4838,9 @@ typedef struct rend_service_descriptor_t {
crypto_pk_t *pk; /**< This service's public key. */
int version; /**< Version of the descriptor format: 0 or 2. */
time_t timestamp; /**< Time when the descriptor was generated. */
- /** Bitmask: which rendezvous protocols are supported?
- * (We allow bits '0', '1', and '2' to be set.) */
- int protocols : REND_PROTOCOL_VERSION_BITMASK_WIDTH;
+ /** Bitmask: which introduce/rendezvous protocols are supported?
+ * (We allow bits '0', '1', '2' and '3' to be set.) */
+ unsigned protocols : REND_PROTOCOL_VERSION_BITMASK_WIDTH;
/** List of the service's introduction points. Elements are removed if
* introduction attempts fail. */
smartlist_t *intro_nodes;