From 86980cf6e232dd30de59bec2c32e0a85c81eb1d2 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 18 Aug 2004 04:44:24 +0000 Subject: Functions to test nickname validity svn:r2269 --- src/or/routerparse.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/or/routerparse.c') diff --git a/src/or/routerparse.c b/src/or/routerparse.c index f3e6a53f8..f434dcd66 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -681,13 +681,8 @@ routerinfo_t *router_parse_entry_from_string(const char *s, if (tok->n_args == 2 || tok->n_args == 5 || tok->n_args == 6) { router->nickname = tor_strdup(tok->args[0]); - if (strlen(router->nickname) > MAX_NICKNAME_LEN) { - log_fn(LOG_WARN,"Router nickname too long."); - goto err; - } - if (strspn(router->nickname, LEGAL_NICKNAME_CHARACTERS) != - strlen(router->nickname)) { - log_fn(LOG_WARN, "Router nickname contains illegal characters."); + if (!is_legal_nickname(router->nickname)) { + log_fn(LOG_WARN,"Router nickname is invalid"); goto err; } router->address = tor_strdup(tok->args[1]); -- cgit v1.2.3