diff options
| author | Roger Dingledine <arma@torproject.org> | 2003-09-29 23:14:49 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2003-09-29 23:14:49 +0000 |
| commit | 3ed7aedc11d85bde5d4da3f7d1a6bdadc037ac75 (patch) | |
| tree | cd6ce1b1bb3c0bdd92485ee4315eafcab549bbf6 /src/or/routers.c | |
| parent | 467d278b8b00740e876ae5ba9e0798ad702b5a67 (diff) | |
| download | tor-3ed7aedc11d85bde5d4da3f7d1a6bdadc037ac75.tar tor-3ed7aedc11d85bde5d4da3f7d1a6bdadc037ac75.tar.gz | |
bugfixes and features: closer to making dirserv work
fix a variety of seg faults
don't try to list OPs in running-routers
write cached-directory to disk when rebuilding the dir
on boot, dirservers load approved-routers file
on boot, dirservers load cached directory file
svn:r508
Diffstat (limited to 'src/or/routers.c')
| -rw-r--r-- | src/or/routers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/routers.c b/src/or/routers.c index e8995a854..f1207bc98 100644 --- a/src/or/routers.c +++ b/src/or/routers.c @@ -669,7 +669,7 @@ int router_get_dir_from_string_impl(char *s, directory_t **dest, NEXT_TOK(); TOK_IS(K_RECOMMENDED_SOFTWARE, "recommended-software"); if (tok.val.cmd.n_args != 1) { - log_fn(LOG_WARNING, "Invalid recommded-software line"); + log_fn(LOG_WARNING, "Invalid recommended-software line"); goto err; } versions = strdup(tok.val.cmd.args[0]); @@ -677,7 +677,7 @@ int router_get_dir_from_string_impl(char *s, directory_t **dest, NEXT_TOK(); TOK_IS(K_RUNNING_ROUTERS, "running-routers"); n_good_nicknames = tok.val.cmd.n_args; - memcpy(good_nickname_lst, tok.val.cmd.args, n_good_nicknames); + memcpy(good_nickname_lst, tok.val.cmd.args, n_good_nicknames*sizeof(char *)); if (router_get_list_from_string_impl(&s, &new_dir, n_good_nicknames, good_nickname_lst)) { |