summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-07-05 22:47:36 -0400
committerMike Perry <mikeperry-git@fscked.org>2009-08-06 11:48:03 -0700
commitda88e05edc8c7180b3eb1a3f4c9e953aa1e7ef5b (patch)
tree3bfc2cd0de2a360c03d95e7a63b2f7ec4919c1aa
parent6fbdf635fa300fb4d9be32cd397dea3bb8cfa4fa (diff)
downloadtor-da88e05edc8c7180b3eb1a3f4c9e953aa1e7ef5b.tar.gz
tor-da88e05edc8c7180b3eb1a3f4c9e953aa1e7ef5b.zip
try loading the bandwidth measurement file on startup too,
in case it's broken.
-rw-r--r--src/or/config.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 952ac00bef..d0f6c8393b 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3208,6 +3208,10 @@ options_validate(or_options_t *old_options, or_options_t *options,
options->V3AuthoritativeDir))
REJECT("AuthoritativeDir is set, but none of "
"(Bridge/HS/V1/V2/V3)AuthoritativeDir is set.");
+ /* If we have a v3bandwidthsfile and it's broken, complain on startup */
+ if (options->V3BandwidthsFile && !old_options) {
+ dirserv_read_measured_bandwidths(options->V3BandwidthsFile, NULL);
+ }
}
if (options->AuthoritativeDir && !options->DirPort)