summaryrefslogtreecommitdiff
path: root/src/or/routerparse.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-10-31 20:48:06 +0000
committerNick Mathewson <nickm@torproject.org>2007-10-31 20:48:06 +0000
commit779b615bc272b287436398ae59afcf1ee19154d6 (patch)
tree5921d55080d96d4abaa946ad96c9c7c0a6197d51 /src/or/routerparse.c
parent17266cc44a0a386ec006970317e2d5941141867b (diff)
downloadtor-779b615bc272b287436398ae59afcf1ee19154d6.tar.gz
tor-779b615bc272b287436398ae59afcf1ee19154d6.zip
r16300@catbus: nickm | 2007-10-31 15:36:41 -0400
Next patch from Karsten: rename some macros, tunnel dir connections, generate (and upload) multiple descriptors as appropriate. svn:r12299
Diffstat (limited to 'src/or/routerparse.c')
-rw-r--r--src/or/routerparse.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 95de8b58dc..9073cd79d7 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -3241,13 +3241,13 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out,
tor_assert(tok);
tor_assert(tok == smartlist_get(tokens, 0));
tor_assert(tok->n_args == 1);
- if (strlen(tok->args[0]) != REND_DESC_ID_V2_BASE32 ||
- strspn(tok->args[0], BASE32_CHARS) != REND_DESC_ID_V2_BASE32) {
+ if (strlen(tok->args[0]) != REND_DESC_ID_V2_LEN_BASE32 ||
+ strspn(tok->args[0], BASE32_CHARS) != REND_DESC_ID_V2_LEN_BASE32) {
log_warn(LD_REND, "Invalid descriptor ID: '%s'", tok->args[0]);
goto err;
}
if (base32_decode(desc_id_out, DIGEST_LEN,
- tok->args[0], REND_DESC_ID_V2_BASE32) < 0) {
+ tok->args[0], REND_DESC_ID_V2_LEN_BASE32) < 0) {
log_warn(LD_REND, "Descriptor ID contains illegal characters: %s",
tok->args[0]);
goto err;