From: Roger Dingledine <arma@torproject.org>
Date: Mon, 6 Jul 2009 02:47:36 +0000 (-0400)
Subject: try loading the bandwidth measurement file on startup too,
X-Git-Tag: tor-0.2.2.1-alpha~23^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da88e05edc8c7180b3eb1a3f4c9e953aa1e7ef5b;p=thirdparty%2Ftor.git

try loading the bandwidth measurement file on startup too,

in case it's broken.
---

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)