diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-12-18 21:27:08 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-12-18 21:27:08 +0000 |
| commit | 5488bc3e16d65972b538795d686a10a8e0e47f6e (patch) | |
| tree | a20c5eaef4980eea1f5e5bdede5421140ec31e5d /src/or/config.c | |
| parent | b8ac050e85209a5ac56eed63954dda63874364b1 (diff) | |
| download | tor-5488bc3e16d65972b538795d686a10a8e0e47f6e.tar.gz tor-5488bc3e16d65972b538795d686a10a8e0e47f6e.zip | |
r17231@catbus: nickm | 2007-12-18 16:21:55 -0500
Document and clean-up geoip code; give it some unit tests.
svn:r12856
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/config.c b/src/or/config.c index 1ae02c7067..302e0a7596 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -192,7 +192,7 @@ static config_var_t _option_vars[] = { V(FetchServerDescriptors, BOOL, "1"), V(FetchHidServDescriptors, BOOL, "1"), V(FetchUselessDescriptors, BOOL, "0"), - V(GEOIPFile, STRING, NULL), + V(GeoIPFile, STRING, NULL), V(Group, STRING, NULL), V(HardwareAccel, BOOL, "0"), V(HashedControlPassword, LINELIST, NULL), @@ -1217,10 +1217,10 @@ options_act(or_options_t *old_options) } /* Maybe load geoip file */ - if (options->GEOIPFile && - ((!old_options || !opt_streq(old_options->GEOIPFile, options->GEOIPFile)) + if (options->GeoIPFile && + ((!old_options || !opt_streq(old_options->GeoIPFile, options->GeoIPFile)) || !geoip_is_loaded())) { - geoip_load_file(options->GEOIPFile); + geoip_load_file(options->GeoIPFile); } /* Check if we need to parse and add the EntryNodes config option. */ if (options->EntryNodes && |