aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-10-28 19:48:16 +0000
committerNick Mathewson <nickm@torproject.org>2007-10-28 19:48:16 +0000
commitd94a978b320a56eaa7daee3c242b5261898ee0d5 (patch)
treed183f1b19f2fcebf880d3e83d6a0ff805f00abce /src/or/or.h
parentc58675ca728f12b42f65e5b8964ae695c2e0ec2d (diff)
downloadtor-d94a978b320a56eaa7daee3c242b5261898ee0d5.tar
tor-d94a978b320a56eaa7daee3c242b5261898ee0d5.tar.gz
r16237@catbus: nickm | 2007-10-28 15:45:25 -0400
Tidy v2 hidden service descriptor format code: fix memory leaks, fix reference problems, note magic numbers, note questions, remove redundant checks, remove a possible stack smashing bug when encoding a descriptor with no protocols supported. svn:r12255
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 00b6fca6e..bba978561 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3372,7 +3372,7 @@ int rend_client_send_introduction(origin_circuit_t *introcirc,
/** Information used to connect to a hidden service. */
typedef struct rend_service_descriptor_t {
crypto_pk_env_t *pk; /**< This service's public key. */
- int version; /**< 0 or 2. */
+ int version; /**< Version of the descriptor format: 0 or 2. */
time_t timestamp; /**< Time when the descriptor was generated. */
uint16_t protocols; /**< Bitmask: which rendezvous protocols are supported?
* (We allow bits '0', '1', and '2' to be set.) */
@@ -3388,6 +3388,9 @@ typedef struct rend_service_descriptor_t {
extend_info_t **intro_point_extend_info;
strmap_t *intro_keys; /**< map from intro node hexdigest to key; only
* used for versioned hidden service descriptors. */
+
+ /* XXXX020 Refactor n_intro_points, intro_points, intro_point_extend_info,
+ * and intro_keys into a list of intro points. */
} rend_service_descriptor_t;
int rend_cmp_service_ids(const char *one, const char *two);