From 71d7e7184dc11e599afb881c7e15674532338512 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 8 Feb 2023 14:49:30 +0000 Subject: Rename hs_index and hsdir_index to hs_{service,relay}_index These new names are the ones used in arti's hsdir_ring.rs and make a lot more sense than calling one of them the "directory" index and the other just the "index". In C Tor these are calculated by functions called hs_build_hs_index hs_build_hsdir_index That might be a reason *not* to accept this change. Or it might be a reason to change the C Tor code. If we don't change the names in the spec the Arti function names should change. --- rend-spec-v3.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rend-spec-v3.txt b/rend-spec-v3.txt index 51267ec..672248e 100644 --- a/rend-spec-v3.txt +++ b/rend-spec-v3.txt @@ -811,7 +811,7 @@ Table of contents: derived, the uploading or downloading party calculates: for replicanum in 1...hsdir_n_replicas: - hs_index(replicanum) = H("store-at-idx" | + hs_service_index(replicanum) = H("store-at-idx" | blinded_public_key | INT_8(replicanum) | INT_8(period_length) | @@ -825,7 +825,7 @@ Table of contents: Then, for each node listed in the current consensus with the HSDir flag, we compute a directory index for that node as: - hsdir_index(node) = H("node-idx" | node_identity | + hs_relay_index(node) = H("node-idx" | node_identity | shared_random_value | INT_8(period_num) | INT_8(period_length) ) @@ -836,7 +836,7 @@ Table of contents: Finally, for replicanum in 1...hsdir_n_replicas, the hidden service host uploads descriptors to the first hsdir_spread_store nodes whose - indices immediately follow hs_index(replicanum). If any of those + indices immediately follow hs_service_index(replicanum). If any of those nodes have already been selected for a lower-numbered replica of the service, any nodes already chosen are disregarded (i.e. skipped over) when choosing a replica's hsdir_spread_store nodes. -- cgit v1.2.3-54-g00ecf