nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

On win32, default to looking for the geoip file in the same directory as torrc. This is a dumb hack; it should turn into a general mechanism.

Browse Source 
svn:r14796
This commit is contained in:
Nick Mathewson 2008-05-29 01:22:30 +00:00
parent 4ead083dbc
commit a335b94c8f
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/or/config.c
View File

@ -199,7 +199,12 @@ static config_var_t _option_vars[] = {
V(FetchHidServDescriptors, BOOL, "1"), V(FetchHidServDescriptors, BOOL, "1"),
V(FetchUselessDescriptors, BOOL, "0"), V(FetchUselessDescriptors, BOOL, "0"),
V(GeoIPFile, STRING, V(GeoIPFile, STRING,
SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"), #ifdef WIN32
"<default>"
#else
SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"
#endif
),
V(Group, STRING, NULL), V(Group, STRING, NULL),
V(HardwareAccel, BOOL, "0"), V(HardwareAccel, BOOL, "0"),
V(HashedControlPassword, LINELIST, NULL), V(HashedControlPassword, LINELIST, NULL),
@ -1259,7 +1264,20 @@ options_act(or_options_t *old_options)
if (options->GeoIPFile && if (options->GeoIPFile &&
((!old_options || !opt_streq(old_options->GeoIPFile, options->GeoIPFile)) ((!old_options || !opt_streq(old_options->GeoIPFile, options->GeoIPFile))
|| !geoip_is_loaded())) { || !geoip_is_loaded())) {
geoip_load_file(options->GeoIPFile); /* XXXX021 Don't use this "<default>" junk; make our filename options
* understand prefixes somehow. -NM */
char *actual_fname = tor_strdup(options->GeoIPFile);
#ifdef WIN32
if (!strcmp(actual_fname, "<default>")) {
const char *conf_root = get_windows_conf_root();
size_t len = tor_malloc(strlen(conf_root)+16);
tor_free(actual_fname);
actual_fname = tor_malloc(len+1);
tor_snprintf(actual_fname, len, "%s\\geoip", conf_root);
}
#endif
geoip_load_file(actual_fname);
tor_free(actual_fname);
} }
/* Check if we need to parse and add the EntryNodes config option. */ /* Check if we need to parse and add the EntryNodes config option. */
if (options->EntryNodes && if (options->EntryNodes &&