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/directory.c | |
| parent | d23cb33a1a7c2fb8e16040826ec2bbda607468c5 (diff) | |
| download | tor-4ec5e139c8442b321ef9b58684da547ea0388261.tar.gz tor-4ec5e139c8442b321ef9b58684da547ea0388261.zip | |
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/directory.c')
| -rw-r--r-- | src/or/directory.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index da82a5a92c..7f464acf3c 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1248,9 +1248,9 @@ connection_dir_client_reached_eof(dir_connection_t *conn) !strcmpstart(conn->requested_resource, "all"))) { /* as we learn from them, we remove them from 'which' */ if (was_ei) { - router_load_extrainfo_from_string(body, SAVED_NOWHERE, which); + router_load_extrainfo_from_string(body, NULL, SAVED_NOWHERE, which); } else { - router_load_routers_from_string(body, SAVED_NOWHERE, which); + router_load_routers_from_string(body, NULL, SAVED_NOWHERE, which); directory_info_has_arrived(now, 0); } } |