diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-05-22 02:20:52 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-05-22 02:20:52 +0000 |
| commit | 4ec5e139c8442b321ef9b58684da547ea0388261 (patch) | |
| tree | 70601b682cc85875f18891293e182770cab2fc95 /src/or/dirserv.c | |
| parent | d23cb33a1a7c2fb8e16040826ec2bbda607468c5 (diff) | |
| download | tor-4ec5e139c8442b321ef9b58684da547ea0388261.tar tor-4ec5e139c8442b321ef9b58684da547ea0388261.tar.gz | |
r12850@catbus: nickm | 2007-05-21 22:20:42 -0400
Partial backport candidate: do not rely on finding a \0 after an mmaped() router/extrainfo file. Also, set journal length correctly when starting up.
svn:r10248
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 03bf5b192..fbe09ed25 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -529,7 +529,7 @@ dirserv_add_multiple_descriptors(const char *desc, const char **msg) s = desc; list = smartlist_create(); - if (!router_parse_list_from_string(&s, list, SAVED_NOWHERE, 0)) { + if (!router_parse_list_from_string(&s, NULL, list, SAVED_NOWHERE, 0)) { SMARTLIST_FOREACH(list, routerinfo_t *, ri, { r_tmp = dirserv_add_descriptor(ri, &msg_out); if (r_tmp < r) { @@ -542,7 +542,7 @@ dirserv_add_multiple_descriptors(const char *desc, const char **msg) smartlist_clear(list); s = desc; - if (!router_parse_list_from_string(&s, list, SAVED_NOWHERE, 1)) { + if (!router_parse_list_from_string(&s, NULL, list, SAVED_NOWHERE, 1)) { SMARTLIST_FOREACH(list, extrainfo_t *, ei, { r_tmp = dirserv_add_extrainfo(ei, &msg_out); if (r_tmp < r) { |