diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-10-01 03:41:33 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-10-01 03:41:33 +0000 |
| commit | c7af43a62497fb3e10c8de9a5bb8cc8113efb99c (patch) | |
| tree | 847f11b6f733a3aa4af359b8d77b56f359327bc2 /src/or | |
| parent | 914086628776bf915f7359a6486427c74391134a (diff) | |
| download | tor-c7af43a62497fb3e10c8de9a5bb8cc8113efb99c.tar.gz tor-c7af43a62497fb3e10c8de9a5bb8cc8113efb99c.zip | |
Now NodeFamily and MyFamily config options allow spaces in
identity fingerprints, so it's easier to paste them in.
Suggested by Lucky Green.
svn:r17021
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/config.c | 7 | ||||
| -rw-r--r-- | src/or/router.c | 2 | ||||
| -rw-r--r-- | src/or/routerlist.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/or/config.c b/src/or/config.c index c288e7f803..d21e248d10 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3740,7 +3740,7 @@ get_default_conf_file(void) #endif } -/** Verify whether lst is a string containing valid-looking space-separated +/** Verify whether lst is a string containing valid-looking comma-separated * nicknames, or NULL. Return 0 on success. Warn and return -1 on failure. */ static int @@ -3752,7 +3752,10 @@ check_nickname_list(const char *lst, const char *name, char **msg) if (!lst) return 0; sl = smartlist_create(); - smartlist_split_string(sl, lst, ",", SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); + + smartlist_split_string(sl, lst, ",", + SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK|SPLIT_STRIP_SPACE, 0); + SMARTLIST_FOREACH(sl, const char *, s, { if (!is_legal_nickname_or_hexdigest(s)) { diff --git a/src/or/router.c b/src/or/router.c index 29b930bbc0..c3dc9867de 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1313,7 +1313,7 @@ router_rebuild_descriptor(int force) family = smartlist_create(); ri->declared_family = smartlist_create(); smartlist_split_string(family, options->MyFamily, ",", - SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); + SPLIT_SKIP_SPACE|SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); SMARTLIST_FOREACH(family, char *, name, { routerinfo_t *member; diff --git a/src/or/routerlist.c b/src/or/routerlist.c index be38cc569e..4ea307d91a 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1324,7 +1324,7 @@ router_nickname_is_in_list(routerinfo_t *router, const char *list) nickname_list = smartlist_create(); smartlist_split_string(nickname_list, list, ",", - SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); + SPLIT_SKIP_SPACE|SPLIT_STRIP_SPACE|SPLIT_IGNORE_BLANK, 0); SMARTLIST_FOREACH(nickname_list, const char *, cp, if (router_nickname_matches(router, cp)) {v=1;break;}); SMARTLIST_FOREACH(nickname_list, char *, cp, tor_free(cp)); |