diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-08-14 17:12:05 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-08-14 17:12:05 -0400 |
| commit | b9e45cc508b6fbf596e1ba40761e11d0629a3291 (patch) | |
| tree | 7d099a8223b0527cb500bd634f36af33e85fa5dd /src/or/config.c | |
| parent | e0dc2e907eb029bd4e3d7933ef72f3ff942a9b81 (diff) | |
| parent | 9e1fe29bebf57fc38975c552eefaa9cb97dd5c68 (diff) | |
| download | tor-b9e45cc508b6fbf596e1ba40761e11d0629a3291.tar.gz tor-b9e45cc508b6fbf596e1ba40761e11d0629a3291.zip | |
Merge commit 'mikeperry/bandwidth-voting-final'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 0b580876fb..de6bfcf680 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -338,6 +338,7 @@ static config_var_t _option_vars[] = { V(V3AuthDistDelay, INTERVAL, "5 minutes"), V(V3AuthNIntervalsValid, UINT, "3"), V(V3AuthUseLegacyKey, BOOL, "0"), + V(V3BandwidthsFile, FILENAME, NULL), VAR("VersioningAuthoritativeDirectory",BOOL,VersioningAuthoritativeDir, "0"), V(VirtualAddrNetwork, STRING, "127.192.0.0/10"), V(WarnPlaintextPorts, CSV, "23,109,110,143"), @@ -3210,6 +3211,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) |