From 779b615bc272b287436398ae59afcf1ee19154d6 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 31 Oct 2007 20:48:06 +0000 Subject: 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 --- src/or/routerparse.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/or/routerparse.c') diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 95de8b58d..9073cd79d 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; -- cgit v1.2.3