2003-10-08 04:04:08 +02:00
|
|
|
/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
|
Implemented link padding and receiver token buckets
Each socket reads at most 'bandwidth' bytes per second sustained, but
can handle bursts of up to 10*bandwidth bytes.
Cells are now sent out at evenly-spaced intervals, with padding sent
out otherwise. Set Linkpadding=0 in the rc file to send cells as soon
as they're available (and to never send padding cells).
Added license/copyrights statements at the top of most files.
router->min and router->max have been merged into a single 'bandwidth'
value. We should make the routerinfo_t reflect this (want to do that,
Mat?)
As the bandwidth increases, and we want to stop sleeping more and more
frequently to send a single cell, cpu usage goes up. At 128kB/s we're
pretty much calling poll with a timeout of 1ms or even 0ms. The current
code takes a timeout of 0-9ms and makes it 10ms. prepare_for_poll()
handles everything that should have happened in the past, so as long as
our buffers don't get too full in that 10ms, we're ok.
Speaking of too full, if you run three servers at 100kB/s with -l debug,
it spends too much time printing debugging messages to be able to keep
up with the cells. The outbuf ultimately fills up and it kills that
connection. If you run with -l err, it works fine up through 500kB/s and
probably beyond. Down the road we'll want to teach it to recognize when
an outbuf is getting full, and back off.
svn:r50
2002-07-16 03:12:15 +02:00
|
|
|
/* See LICENSE for licensing information */
|
|
|
|
/* $Id$ */
|
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/**
|
|
|
|
* /file config.c
|
|
|
|
*
|
|
|
|
* /brief Code to parse and interpret configuration files.
|
|
|
|
*
|
|
|
|
**/
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
#include "or.h"
|
2004-08-18 05:42:55 +02:00
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
#include <shlobj.h>
|
|
|
|
#endif
|
2002-10-03 04:17:41 +02:00
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/** Enumeration of types which option values can take */
|
|
|
|
typedef enum config_type_t {
|
2004-10-14 04:47:09 +02:00
|
|
|
CONFIG_TYPE_STRING = 0, /**< An arbitrary string. */
|
|
|
|
CONFIG_TYPE_UINT, /**< A non-negative integer less than MAX_INT */
|
|
|
|
CONFIG_TYPE_DOUBLE, /**< A floating-point value */
|
|
|
|
CONFIG_TYPE_BOOL, /**< A boolean value, expressed as 0 or 1. */
|
|
|
|
CONFIG_TYPE_CSV, /**< A list of strings, separated by commas and optional
|
|
|
|
* whitespace. */
|
|
|
|
CONFIG_TYPE_LINELIST, /**< Uninterpreted config lines */
|
2004-11-04 23:31:50 +01:00
|
|
|
CONFIG_TYPE_LINELIST_S, /**< Uninterpreted, context-sensitive config lines,
|
|
|
|
* mixed with other keywords. */
|
|
|
|
CONFIG_TYPE_LINELIST_V, /**< Catch-all "virtual" option to summarize
|
|
|
|
* context-sensitive config lines when fetching.
|
|
|
|
*/
|
2004-10-14 04:47:09 +02:00
|
|
|
CONFIG_TYPE_OBSOLETE, /**< Obsolete (ignored) option. */
|
2004-05-10 06:48:13 +02:00
|
|
|
} config_type_t;
|
2003-09-08 07:16:18 +02:00
|
|
|
|
2004-10-27 05:08:04 +02:00
|
|
|
/* An abbreviation for a configuration option allowed on the command line */
|
2004-10-27 04:30:28 +02:00
|
|
|
typedef struct config_abbrev_t {
|
2004-10-27 23:14:11 +02:00
|
|
|
const char *abbreviated;
|
|
|
|
const char *full;
|
2004-10-27 19:37:01 +02:00
|
|
|
int commandline_only;
|
2004-10-27 04:30:28 +02:00
|
|
|
} config_abbrev_t;
|
|
|
|
|
2004-10-27 19:37:01 +02:00
|
|
|
/* Handy macro for declaring "In the config file or on the command line,
|
|
|
|
* you can abbreviate <b>tok</b>s as <b>tok</b>". */
|
|
|
|
#define PLURAL(tok) { #tok, #tok "s", 0 }
|
|
|
|
|
2004-10-27 05:08:04 +02:00
|
|
|
/* A list of command-line abbreviations. */
|
2004-10-27 04:30:28 +02:00
|
|
|
static config_abbrev_t config_abbrevs[] = {
|
2004-10-27 19:37:01 +02:00
|
|
|
PLURAL(ExitNode),
|
|
|
|
PLURAL(EntryNodes),
|
|
|
|
PLURAL(ExcludeNode),
|
|
|
|
PLURAL(FirewallPort),
|
|
|
|
PLURAL(HiddenServiceNode),
|
|
|
|
PLURAL(HiddenServiceExcludeNode),
|
|
|
|
PLURAL(RendNode),
|
|
|
|
PLURAL(RendExcludeNode),
|
2004-11-04 04:25:43 +01:00
|
|
|
{ "l", "LogLevel", 1},
|
|
|
|
{ "BandwidthRate", "BandwidthRateBytes", 1},
|
|
|
|
{ "BandwidthBurst", "BandwidthBurstBytes", 1},
|
2004-10-27 23:14:11 +02:00
|
|
|
{ NULL, NULL , 0},
|
2004-10-27 04:30:28 +02:00
|
|
|
};
|
2004-10-27 19:37:01 +02:00
|
|
|
#undef PLURAL
|
2004-10-27 04:30:28 +02:00
|
|
|
|
2004-11-03 11:08:44 +01:00
|
|
|
/** A variable allowed in the configuration file or on the command line. */
|
2004-10-27 04:30:28 +02:00
|
|
|
typedef struct config_var_t {
|
2004-11-03 11:08:44 +01:00
|
|
|
const char *name; /**< The full keyword (case insensitive). */
|
|
|
|
config_type_t type; /**< How to interpret the type and turn it into a value. */
|
|
|
|
off_t var_offset; /**< Offset of the corresponding member of or_options_t. */
|
|
|
|
const char *initvalue; /**< String (or null) describing initial value. */
|
2004-10-27 04:30:28 +02:00
|
|
|
} config_var_t;
|
|
|
|
|
2004-10-27 05:08:04 +02:00
|
|
|
/** Return the offset of <b>member</b> within the type <b>tp</b>, in bytes */
|
2004-11-04 05:01:19 +01:00
|
|
|
#define STRUCT_OFFSET(tp, member) ((off_t) (((char*)&((tp*)0)->member)-(char*)0))
|
2004-10-27 05:08:04 +02:00
|
|
|
/** An entry for config_vars: "The option <b>name</b> has type
|
|
|
|
* CONFIG_TYPE_<b>conftype</b>, and corresponds to
|
|
|
|
* or_options_t.<b>member</b>"
|
|
|
|
*/
|
2004-11-03 11:08:44 +01:00
|
|
|
#define VAR(name,conftype,member,initvalue) \
|
|
|
|
{ name, CONFIG_TYPE_ ## conftype, STRUCT_OFFSET(or_options_t, member), initvalue }
|
2004-10-27 05:08:04 +02:00
|
|
|
/** An entry for config_vars: "The option <b>name</b> is obsolete." */
|
2004-11-03 11:08:44 +01:00
|
|
|
#define OBSOLETE(name) { name, CONFIG_TYPE_OBSOLETE, 0, NULL }
|
2004-10-27 04:30:28 +02:00
|
|
|
|
2004-10-27 05:08:04 +02:00
|
|
|
/** Array of configuration options. Until we disallow nonstandard
|
|
|
|
* abbreviations, order is significant, since the first matching option will
|
|
|
|
* be chosen first.
|
|
|
|
*/
|
2004-10-27 04:30:28 +02:00
|
|
|
static config_var_t config_vars[] = {
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("Address", STRING, Address, NULL),
|
2004-11-04 09:26:34 +01:00
|
|
|
VAR("AllowUnverifiedNodes",CSV, AllowUnverifiedNodes, "middle,rendezvous"),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("AuthoritativeDirectory",BOOL, AuthoritativeDir, "0"),
|
2004-11-04 04:25:43 +01:00
|
|
|
VAR("BandwidthRateBytes", UINT, BandwidthRateBytes, "800000"),
|
|
|
|
VAR("BandwidthBurstBytes", UINT, BandwidthBurstBytes, "50000000"),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("ClientOnly", BOOL, ClientOnly, "0"),
|
|
|
|
VAR("ContactInfo", STRING, ContactInfo, NULL),
|
2004-11-04 07:41:49 +01:00
|
|
|
VAR("ControlPort", UINT, ControlPort, "0"),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("DebugLogFile", STRING, DebugLogFile, NULL),
|
|
|
|
VAR("DataDirectory", STRING, DataDirectory, NULL),
|
|
|
|
VAR("DirPort", UINT, DirPort, "0"),
|
|
|
|
VAR("DirBindAddress", LINELIST, DirBindAddress, NULL),
|
|
|
|
VAR("DirFetchPostPeriod", UINT, DirFetchPostPeriod, "600"),
|
|
|
|
VAR("DirPolicy", LINELIST, DirPolicy, NULL),
|
|
|
|
VAR("DirServer", LINELIST, DirServers, NULL),
|
|
|
|
VAR("ExitNodes", STRING, ExitNodes, NULL),
|
|
|
|
VAR("EntryNodes", STRING, EntryNodes, NULL),
|
|
|
|
VAR("StrictExitNodes", BOOL, StrictExitNodes, "0"),
|
|
|
|
VAR("StrictEntryNodes", BOOL, StrictEntryNodes, "0"),
|
|
|
|
VAR("ExitPolicy", LINELIST, ExitPolicy, NULL),
|
|
|
|
VAR("ExcludeNodes", STRING, ExcludeNodes, NULL),
|
|
|
|
VAR("FascistFirewall", BOOL, FascistFirewall, "0"),
|
|
|
|
VAR("FirewallPorts", CSV, FirewallPorts, NULL),
|
|
|
|
VAR("MyFamily", STRING, MyFamily, NULL),
|
|
|
|
VAR("NodeFamily", LINELIST, NodeFamilies, NULL),
|
|
|
|
VAR("Group", STRING, Group, NULL),
|
2004-11-03 20:49:03 +01:00
|
|
|
VAR("HashedControlPassword",STRING, HashedControlPassword, NULL),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("HttpProxy", STRING, HttpProxy, NULL),
|
2004-11-04 23:31:50 +01:00
|
|
|
VAR("HiddenServiceOptions",LINELIST_V, RendConfigLines, NULL),
|
|
|
|
VAR("HiddenServiceDir", LINELIST_S, RendConfigLines, NULL),
|
|
|
|
VAR("HiddenServicePort", LINELIST_S, RendConfigLines, NULL),
|
|
|
|
VAR("HiddenServiceNodes", LINELIST_S, RendConfigLines, NULL),
|
|
|
|
VAR("HiddenServiceExcludeNodes", LINELIST_S, RendConfigLines, NULL),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("IgnoreVersion", BOOL, IgnoreVersion, "0"),
|
|
|
|
VAR("KeepalivePeriod", UINT, KeepalivePeriod, "300"),
|
2004-11-04 23:31:50 +01:00
|
|
|
VAR("LogOptions", LINELIST_V, LogOptions, NULL),
|
|
|
|
VAR("LogLevel", LINELIST_S, LogOptions, NULL),
|
|
|
|
VAR("LogFile", LINELIST_S, LogOptions, NULL),
|
2004-10-27 04:30:28 +02:00
|
|
|
OBSOLETE("LinkPadding"),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("MaxConn", UINT, MaxConn, "1024"),
|
|
|
|
VAR("MaxOnionsPending", UINT, MaxOnionsPending, "100"),
|
|
|
|
VAR("MonthlyAccountingStart",UINT, AccountingStart, "0"),
|
|
|
|
VAR("AccountingMaxKB", UINT, AccountingMaxKB, "0"),
|
|
|
|
VAR("Nickname", STRING, Nickname, NULL),
|
|
|
|
VAR("NewCircuitPeriod", UINT, NewCircuitPeriod, "30"),
|
|
|
|
VAR("NumCpus", UINT, NumCpus, "1"),
|
|
|
|
VAR("ORPort", UINT, ORPort, "0"),
|
|
|
|
VAR("ORBindAddress", LINELIST, ORBindAddress, NULL),
|
|
|
|
VAR("OutboundBindAddress", STRING, OutboundBindAddress, NULL),
|
|
|
|
VAR("PidFile", STRING, PidFile, NULL),
|
|
|
|
VAR("PathlenCoinWeight", DOUBLE, PathlenCoinWeight, "0.3"),
|
|
|
|
VAR("RedirectExit", LINELIST, RedirectExit, NULL),
|
2004-10-27 04:30:28 +02:00
|
|
|
OBSOLETE("RouterFile"),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("RunAsDaemon", BOOL, RunAsDaemon, "0"),
|
|
|
|
VAR("RunTesting", BOOL, RunTesting, "0"),
|
|
|
|
VAR("RecommendedVersions", LINELIST, RecommendedVersions, NULL),
|
|
|
|
VAR("RendNodes", STRING, RendNodes, NULL),
|
|
|
|
VAR("RendExcludeNodes", STRING, RendExcludeNodes, NULL),
|
2004-11-04 09:26:34 +01:00
|
|
|
VAR("SocksPort", UINT, SocksPort, "9050"),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("SocksBindAddress", LINELIST, SocksBindAddress, NULL),
|
|
|
|
VAR("SocksPolicy", LINELIST, SocksPolicy, NULL),
|
2004-11-04 23:31:50 +01:00
|
|
|
VAR("SysLog", LINELIST_S, LogOptions, NULL),
|
2004-10-27 04:30:28 +02:00
|
|
|
OBSOLETE("TrafficShaping"),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("User", STRING, User, NULL),
|
|
|
|
{ NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }
|
2004-10-27 04:30:28 +02:00
|
|
|
};
|
|
|
|
#undef VAR
|
|
|
|
#undef OBSOLETE
|
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/** Largest allowed config line */
|
2004-03-31 23:35:23 +02:00
|
|
|
#define CONFIG_LINE_T_MAXLEN 4096
|
2003-09-08 07:16:18 +02:00
|
|
|
|
2004-03-31 23:35:23 +02:00
|
|
|
static struct config_line_t *config_get_commandlines(int argc, char **argv);
|
2004-09-03 00:08:36 +02:00
|
|
|
static int config_get_lines(FILE *f, struct config_line_t **result);
|
2004-03-31 23:35:23 +02:00
|
|
|
static void config_free_lines(struct config_line_t *front);
|
2004-11-04 23:31:50 +01:00
|
|
|
static int config_assign_line(or_options_t *options, struct config_line_t *c,
|
|
|
|
int reset);
|
|
|
|
static int config_assign(or_options_t *options, struct config_line_t *list,
|
|
|
|
int reset);
|
2004-10-12 17:55:20 +02:00
|
|
|
static int parse_dir_server_line(const char *line);
|
2004-10-17 00:56:46 +02:00
|
|
|
static int parse_redirect_line(or_options_t *options,
|
|
|
|
struct config_line_t *line);
|
2004-10-27 19:37:01 +02:00
|
|
|
static const char *expand_abbrev(const char *option, int commandline_only);
|
2004-10-27 04:30:28 +02:00
|
|
|
static config_var_t *config_find_option(const char *key);
|
2004-11-04 23:31:50 +01:00
|
|
|
static void reset_option(or_options_t *options, config_var_t *var);
|
2003-09-08 07:16:18 +02:00
|
|
|
|
2004-10-27 05:08:04 +02:00
|
|
|
/** If <b>option</b> is an official abbreviation for a longer option,
|
2004-10-27 19:37:01 +02:00
|
|
|
* return the longer option. Otherwise return <b>option</b>.
|
|
|
|
* If <b>command_line</b> is set, apply all abbreviations. Otherwise, only
|
|
|
|
* apply abbreviations that work for the config file and the command line. */
|
2004-10-27 04:30:28 +02:00
|
|
|
static const char *
|
2004-10-27 19:37:01 +02:00
|
|
|
expand_abbrev(const char *option, int command_line)
|
2004-10-27 04:30:28 +02:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i=0; config_abbrevs[i].abbreviated; ++i) {
|
|
|
|
/* Abbreviations aren't casei. */
|
2004-10-27 19:37:01 +02:00
|
|
|
if (!strcmp(option,config_abbrevs[i].abbreviated) &&
|
|
|
|
(command_line || !config_abbrevs[i].commandline_only)) {
|
2004-10-27 04:30:28 +02:00
|
|
|
return config_abbrevs[i].full;
|
2004-10-27 19:37:01 +02:00
|
|
|
}
|
2004-10-27 04:30:28 +02:00
|
|
|
}
|
|
|
|
return option;
|
|
|
|
}
|
2004-10-17 03:57:34 +02:00
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/** Helper: Read a list of configuration options from the command line. */
|
2004-10-14 04:47:09 +02:00
|
|
|
static struct config_line_t *
|
|
|
|
config_get_commandlines(int argc, char **argv)
|
|
|
|
{
|
2004-03-31 23:35:23 +02:00
|
|
|
struct config_line_t *new;
|
|
|
|
struct config_line_t *front = NULL;
|
2002-11-23 07:49:01 +01:00
|
|
|
char *s;
|
|
|
|
int i = 1;
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
while (i < argc-1) {
|
2004-11-03 20:49:03 +01:00
|
|
|
if (!strcmp(argv[i],"-f") ||
|
|
|
|
!strcmp(argv[i],"--hash-password")) {
|
|
|
|
i += 2; /* command-line option with argument. ignore them. */
|
2002-11-23 07:49:01 +01:00
|
|
|
continue;
|
2004-10-30 21:18:37 +02:00
|
|
|
} else if (!strcmp(argv[i],"--list-fingerprint")) {
|
|
|
|
i += 1; /* command-line option. ignore it. */
|
2004-11-03 20:49:03 +01:00
|
|
|
continue;
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
|
|
|
|
2004-03-31 23:35:23 +02:00
|
|
|
new = tor_malloc(sizeof(struct config_line_t));
|
2002-11-23 07:49:01 +01:00
|
|
|
s = argv[i];
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2002-11-23 07:49:01 +01:00
|
|
|
while(*s == '-')
|
|
|
|
s++;
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-10-27 19:37:01 +02:00
|
|
|
new->key = tor_strdup(expand_abbrev(s, 1));
|
2003-10-04 05:29:09 +02:00
|
|
|
new->value = tor_strdup(argv[i+1]);
|
2002-11-23 07:49:01 +01:00
|
|
|
|
|
|
|
log(LOG_DEBUG,"Commandline: parsed keyword '%s', value '%s'",
|
2004-10-14 04:47:09 +02:00
|
|
|
new->key, new->value);
|
2002-11-23 07:49:01 +01:00
|
|
|
new->next = front;
|
|
|
|
front = new;
|
|
|
|
i += 2;
|
|
|
|
}
|
|
|
|
return front;
|
|
|
|
}
|
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/** Helper: allocate a new configuration option mapping 'key' to 'val',
|
|
|
|
* prepend it to 'front', and return the newly allocated config_line_t */
|
2004-11-04 23:31:50 +01:00
|
|
|
struct config_line_t *
|
2004-03-31 23:35:23 +02:00
|
|
|
config_line_prepend(struct config_line_t *front,
|
|
|
|
const char *key,
|
|
|
|
const char *val)
|
|
|
|
{
|
|
|
|
struct config_line_t *newline;
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-03-31 23:35:23 +02:00
|
|
|
newline = tor_malloc(sizeof(struct config_line_t));
|
|
|
|
newline->key = tor_strdup(key);
|
|
|
|
newline->value = tor_strdup(val);
|
|
|
|
newline->next = front;
|
|
|
|
return newline;
|
|
|
|
}
|
|
|
|
|
2004-05-10 09:37:10 +02:00
|
|
|
/** Helper: parse the config file and strdup into key/value
|
2004-09-03 00:08:36 +02:00
|
|
|
* strings. Set *result to the list, or NULL if parsing the file
|
|
|
|
* failed. Return 0 on success, -1 on failure. Warn and ignore any
|
|
|
|
* misformatted lines. */
|
2004-10-14 04:47:09 +02:00
|
|
|
static int
|
|
|
|
config_get_lines(FILE *f, struct config_line_t **result)
|
|
|
|
{
|
2004-03-31 23:35:23 +02:00
|
|
|
struct config_line_t *front = NULL;
|
|
|
|
char line[CONFIG_LINE_T_MAXLEN];
|
2004-09-03 00:08:36 +02:00
|
|
|
int r;
|
2003-09-29 09:50:08 +02:00
|
|
|
char *key, *value;
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
while ((r = parse_line_from_file(line, sizeof(line), f, &key, &value)) > 0) {
|
2004-03-31 23:35:23 +02:00
|
|
|
front = config_line_prepend(front, key, value);
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
2004-10-14 04:47:09 +02:00
|
|
|
|
|
|
|
if (r < 0) {
|
2004-09-03 00:08:36 +02:00
|
|
|
*result = NULL;
|
|
|
|
return -1;
|
|
|
|
}
|
2004-11-04 09:26:34 +01:00
|
|
|
*result = front;
|
|
|
|
return 0;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/**
|
|
|
|
* Free all the configuration lines on the linked list <b>front</b>.
|
|
|
|
*/
|
2004-10-14 04:47:09 +02:00
|
|
|
static void
|
|
|
|
config_free_lines(struct config_line_t *front)
|
|
|
|
{
|
2004-03-31 23:35:23 +02:00
|
|
|
struct config_line_t *tmp;
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
while (front) {
|
2002-11-23 07:49:01 +01:00
|
|
|
tmp = front;
|
|
|
|
front = tmp->next;
|
|
|
|
|
2004-09-29 08:52:36 +02:00
|
|
|
tor_free(tmp->key);
|
|
|
|
tor_free(tmp->value);
|
|
|
|
tor_free(tmp);
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-10-27 05:08:04 +02:00
|
|
|
/** If <b>key</b> is a configuration option, return the corresponding
|
|
|
|
* config_var_t. Otherwise, if <b>key</b> is a non-standard abbreviation,
|
|
|
|
* warn, and return the corresponding config_var_t. Otherwise return NULL.
|
|
|
|
*/
|
2004-10-27 04:30:28 +02:00
|
|
|
static config_var_t *config_find_option(const char *key)
|
|
|
|
{
|
|
|
|
int i;
|
2004-10-27 05:08:04 +02:00
|
|
|
/* First, check for an exact (case-insensitive) match */
|
2004-10-27 04:30:28 +02:00
|
|
|
for (i=0; config_vars[i].name; ++i) {
|
2004-10-27 05:08:04 +02:00
|
|
|
if (!strcasecmp(key, config_vars[i].name))
|
2004-10-27 04:30:28 +02:00
|
|
|
return &config_vars[i];
|
2004-10-27 05:08:04 +02:00
|
|
|
}
|
|
|
|
/* If none, check for an abbreviated match */
|
|
|
|
for (i=0; config_vars[i].name; ++i) {
|
|
|
|
if (!strncasecmp(key, config_vars[i].name, strlen(key))) {
|
2004-10-27 04:30:28 +02:00
|
|
|
log_fn(LOG_WARN, "The abbreviation '%s' is deprecated. "
|
|
|
|
"Tell Nick and Roger to make it official, or just use '%s' instead",
|
|
|
|
key, config_vars[i].name);
|
|
|
|
return &config_vars[i];
|
|
|
|
}
|
|
|
|
}
|
2004-10-27 05:08:04 +02:00
|
|
|
/* Okay, unrecogized options */
|
2004-10-27 04:30:28 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2004-10-27 05:08:04 +02:00
|
|
|
/** If <b>c</b> is a syntactically valid configuration line, update
|
2004-11-04 23:31:50 +01:00
|
|
|
* <b>options</b> with its value and return 0. Otherwise return -1.
|
|
|
|
*
|
|
|
|
* If 'reset' is set, and we get a line containing no value, restore the
|
|
|
|
* option to its default value.
|
|
|
|
*/
|
2004-10-14 04:47:09 +02:00
|
|
|
static int
|
2004-11-04 23:31:50 +01:00
|
|
|
config_assign_line(or_options_t *options, struct config_line_t *c, int reset)
|
2004-10-14 04:47:09 +02:00
|
|
|
{
|
2004-10-12 22:22:09 +02:00
|
|
|
int i, ok;
|
2004-10-27 04:30:28 +02:00
|
|
|
config_var_t *var;
|
|
|
|
void *lvalue;
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2004-10-27 04:30:28 +02:00
|
|
|
var = config_find_option(c->key);
|
|
|
|
if (!var) {
|
|
|
|
log_fn(LOG_WARN, "Unknown option '%s'. Failing.", c->key);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
/* Put keyword into canonical case. */
|
|
|
|
if (strcmp(var->name, c->key)) {
|
2004-05-19 22:07:08 +02:00
|
|
|
tor_free(c->key);
|
2004-10-27 04:30:28 +02:00
|
|
|
c->key = tor_strdup(var->name);
|
2004-05-19 22:07:08 +02:00
|
|
|
}
|
|
|
|
|
2004-11-04 23:31:50 +01:00
|
|
|
if (reset && !strlen(c->value)) {
|
|
|
|
reset_option(options, var);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-10-27 20:14:38 +02:00
|
|
|
lvalue = ((char*)options) + var->var_offset;
|
2004-10-27 04:30:28 +02:00
|
|
|
switch(var->type) {
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
case CONFIG_TYPE_UINT:
|
|
|
|
i = tor_parse_long(c->value, 10, 0, INT_MAX, &ok, NULL);
|
|
|
|
if (!ok) {
|
|
|
|
log(LOG_WARN, "Int keyword '%s %s' is malformed or out of bounds. Skipping.",
|
|
|
|
c->key,c->value);
|
|
|
|
return 0;
|
|
|
|
}
|
2004-10-27 04:30:28 +02:00
|
|
|
*(int *)lvalue = i;
|
2004-10-14 04:47:09 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case CONFIG_TYPE_BOOL:
|
|
|
|
i = tor_parse_long(c->value, 10, 0, 1, &ok, NULL);
|
|
|
|
if (!ok) {
|
|
|
|
log(LOG_WARN, "Boolean keyword '%s' expects 0 or 1. Skipping.", c->key);
|
|
|
|
return 0;
|
|
|
|
}
|
2004-10-27 04:30:28 +02:00
|
|
|
*(int *)lvalue = i;
|
2004-10-14 04:47:09 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case CONFIG_TYPE_STRING:
|
2004-10-27 04:30:28 +02:00
|
|
|
tor_free(*(char **)lvalue);
|
|
|
|
*(char **)lvalue = tor_strdup(c->value);
|
2004-10-14 04:47:09 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case CONFIG_TYPE_DOUBLE:
|
2004-10-27 04:30:28 +02:00
|
|
|
*(double *)lvalue = atof(c->value);
|
2004-10-14 04:47:09 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case CONFIG_TYPE_CSV:
|
2004-10-27 04:30:28 +02:00
|
|
|
if (*(smartlist_t**)lvalue == NULL)
|
|
|
|
*(smartlist_t**)lvalue = smartlist_create();
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-10-27 04:30:28 +02:00
|
|
|
smartlist_split_string(*(smartlist_t**)lvalue, c->value, ",",
|
2004-10-14 04:47:09 +02:00
|
|
|
SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
|
|
|
|
break;
|
|
|
|
|
2004-11-04 23:31:50 +01:00
|
|
|
|
|
|
|
case CONFIG_TYPE_LINELIST:
|
|
|
|
case CONFIG_TYPE_LINELIST_S:
|
|
|
|
/* Note: this reverses the order that the lines appear in. That's
|
|
|
|
* just fine, since we build up the list of lines reversed in the
|
|
|
|
* first place. */
|
|
|
|
*(struct config_line_t**)lvalue =
|
|
|
|
config_line_prepend(*(struct config_line_t**)lvalue, c->key, c->value);
|
|
|
|
break;
|
2004-10-14 04:47:09 +02:00
|
|
|
|
|
|
|
case CONFIG_TYPE_OBSOLETE:
|
|
|
|
log_fn(LOG_WARN, "Skipping obsolete configuration option '%s'", c->key);
|
|
|
|
break;
|
2004-11-04 23:31:50 +01:00
|
|
|
case CONFIG_TYPE_LINELIST_V:
|
|
|
|
log_fn(LOG_WARN, "Can't provide value for virtual option '%s'", c->key);
|
|
|
|
return -1;
|
|
|
|
default:
|
|
|
|
tor_assert(0);
|
|
|
|
break;
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-10-27 04:30:28 +02:00
|
|
|
return 0;
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
|
|
|
|
2004-11-04 23:31:50 +01:00
|
|
|
/** restore the option named <b>key</b> in options to its default value. */
|
|
|
|
static void
|
|
|
|
config_reset_line(or_options_t *options, const char *key)
|
|
|
|
{
|
|
|
|
config_var_t *var;
|
|
|
|
|
|
|
|
var = config_find_option(key);
|
|
|
|
if (!var)
|
|
|
|
return; /* give error on next pass. */
|
|
|
|
|
|
|
|
reset_option(options, var);
|
|
|
|
}
|
|
|
|
|
2004-11-03 19:29:29 +01:00
|
|
|
/** Return a canonicalized list of the options assigned for key.
|
|
|
|
*/
|
|
|
|
struct config_line_t *
|
|
|
|
config_get_assigned_option(or_options_t *options, const char *key)
|
|
|
|
{
|
|
|
|
config_var_t *var;
|
|
|
|
const void *value;
|
|
|
|
char buf[32];
|
|
|
|
struct config_line_t *result;
|
|
|
|
|
|
|
|
var = config_find_option(key);
|
|
|
|
if (!var) {
|
|
|
|
log_fn(LOG_WARN, "Unknown option '%s'. Failing.", key);
|
|
|
|
return NULL;
|
2004-11-04 23:31:50 +01:00
|
|
|
} else if (var->type == CONFIG_TYPE_LINELIST_S) {
|
|
|
|
log_fn(LOG_WARN, "Can't return context-sensitive '%s' on its own", key);
|
|
|
|
return NULL;
|
2004-11-03 19:29:29 +01:00
|
|
|
}
|
|
|
|
value = ((char*)options) + var->var_offset;
|
|
|
|
|
2004-11-04 23:31:50 +01:00
|
|
|
if (var->type == CONFIG_TYPE_LINELIST ||
|
|
|
|
var->type == CONFIG_TYPE_LINELIST_V) {
|
2004-11-03 19:29:29 +01:00
|
|
|
/* Linelist requires special handling: we just copy and return it. */
|
|
|
|
const struct config_line_t *next_in = value;
|
|
|
|
struct config_line_t **next_out = &result;
|
|
|
|
while (next_in) {
|
|
|
|
*next_out = tor_malloc(sizeof(struct config_line_t));
|
|
|
|
(*next_out)->key = tor_strdup(next_in->key);
|
|
|
|
(*next_out)->value = tor_strdup(next_in->value);
|
|
|
|
next_in = next_in->next;
|
|
|
|
next_out = &((*next_out)->next);
|
|
|
|
}
|
|
|
|
(*next_out) = NULL;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
result = tor_malloc_zero(sizeof(struct config_line_t));
|
|
|
|
result->key = tor_strdup(var->name);
|
|
|
|
switch(var->type)
|
|
|
|
{
|
|
|
|
case CONFIG_TYPE_STRING:
|
|
|
|
result->value = tor_strdup(value ? (char*)value : "");
|
|
|
|
break;
|
|
|
|
case CONFIG_TYPE_UINT:
|
|
|
|
tor_snprintf(buf, sizeof(buf), "%d", *(int*)value);
|
|
|
|
result->value = tor_strdup(buf);
|
|
|
|
break;
|
|
|
|
case CONFIG_TYPE_DOUBLE:
|
|
|
|
tor_snprintf(buf, sizeof(buf), "%f", *(double*)value);
|
|
|
|
result->value = tor_strdup(buf);
|
|
|
|
break;
|
|
|
|
case CONFIG_TYPE_BOOL:
|
|
|
|
result->value = tor_strdup(*(int*)value ? "1" : "0");
|
|
|
|
break;
|
|
|
|
case CONFIG_TYPE_CSV:
|
|
|
|
if (value)
|
|
|
|
result->value = smartlist_join_strings((smartlist_t*)value,",",0,NULL);
|
|
|
|
else
|
|
|
|
result->value = tor_strdup("");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
tor_free(result->key);
|
|
|
|
tor_free(result);
|
2004-11-04 00:13:28 +01:00
|
|
|
log_fn(LOG_WARN,"Bug: unknown type %d for known key %s", var->type, key);
|
2004-11-03 19:29:29 +01:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2004-11-04 09:26:34 +01:00
|
|
|
/** Iterate through the linked list of requested options <b>list</b>.
|
2004-05-10 06:48:13 +02:00
|
|
|
* For each item, convert as appropriate and assign to <b>options</b>.
|
2004-03-02 06:00:50 +01:00
|
|
|
* If an item is unrecognized, return -1 immediately,
|
2004-11-04 23:31:50 +01:00
|
|
|
* else return 0 for success.
|
|
|
|
*
|
|
|
|
* If <b>reset</b>, then interpret empty lines as meaning "restore to
|
|
|
|
* default value", and interpret LINELIST* options as replacing (not
|
|
|
|
* extending) their previous values.
|
|
|
|
*/
|
2004-10-14 04:47:09 +02:00
|
|
|
static int
|
2004-11-04 23:31:50 +01:00
|
|
|
config_assign(or_options_t *options, struct config_line_t *list, int reset)
|
2004-10-14 04:47:09 +02:00
|
|
|
{
|
2004-11-04 23:31:50 +01:00
|
|
|
struct config_line_t *p;
|
|
|
|
|
|
|
|
/* pass 1: normalize keys */
|
|
|
|
for (p = list; p; p = p->next) {
|
|
|
|
const char *full = expand_abbrev(p->key, 0);
|
|
|
|
if (strcmp(full,p->key)) {
|
|
|
|
tor_free(p->key);
|
|
|
|
p->key = tor_strdup(full);
|
2004-10-27 19:37:01 +02:00
|
|
|
}
|
2004-11-04 23:31:50 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* pass 2: if we're reading from a resetting souurce, clear all mentioned
|
|
|
|
* linelists. */
|
|
|
|
if (reset) {
|
|
|
|
for (p = list; p; p = p->next)
|
|
|
|
config_reset_line(options, p->key);
|
|
|
|
}
|
2004-10-27 19:37:01 +02:00
|
|
|
|
2004-11-04 23:31:50 +01:00
|
|
|
/* pass 3: assign. */
|
|
|
|
while (list) {
|
|
|
|
if (config_assign_line(options, list, reset))
|
2004-03-02 06:00:50 +01:00
|
|
|
return -1;
|
2002-11-23 07:49:01 +01:00
|
|
|
list = list->next;
|
2003-12-17 22:09:31 +01:00
|
|
|
}
|
2004-03-02 06:00:50 +01:00
|
|
|
return 0;
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
static void
|
|
|
|
add_default_trusted_dirservers(void)
|
|
|
|
{
|
2004-10-12 21:01:28 +02:00
|
|
|
/* moria1 */
|
|
|
|
parse_dir_server_line("18.244.0.188:9031 "
|
|
|
|
"FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441");
|
|
|
|
/* moria2 */
|
2004-10-14 12:05:22 +02:00
|
|
|
parse_dir_server_line("18.244.0.114:80 "
|
2004-10-12 21:01:28 +02:00
|
|
|
"719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF");
|
|
|
|
/* tor26 */
|
|
|
|
parse_dir_server_line("62.116.124.106:9030 "
|
|
|
|
"847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D");
|
2004-02-26 23:56:36 +01:00
|
|
|
}
|
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/** Print a usage message for tor. */
|
2004-10-14 04:47:09 +02:00
|
|
|
static void
|
|
|
|
print_usage(void)
|
|
|
|
{
|
2003-10-25 14:01:09 +02:00
|
|
|
printf("tor -f <torrc> [args]\n"
|
2004-11-04 07:41:49 +01:00
|
|
|
"See man page for more options. This -h is obsolete.\n");
|
|
|
|
#if 0
|
2004-01-11 00:40:38 +01:00
|
|
|
"-b <bandwidth>\t\tbytes/second rate limiting\n"
|
2003-10-25 14:01:09 +02:00
|
|
|
"-d <file>\t\tDebug file\n"
|
2003-11-12 20:34:34 +01:00
|
|
|
"-l <level>\t\tLog level\n"
|
|
|
|
"-r <file>\t\tList of known routers\n");
|
|
|
|
printf("\nClient options:\n"
|
|
|
|
"-e \"nick1 nick2 ...\"\t\tExit nodes\n"
|
2004-10-14 04:47:09 +02:00
|
|
|
"-s <IP>\t\t\tPort to bind to for Socks\n");
|
2003-11-12 20:34:34 +01:00
|
|
|
printf("\nServer options:\n"
|
|
|
|
"-n <nick>\t\tNickname of router\n"
|
2003-10-25 14:01:09 +02:00
|
|
|
"-o <port>\t\tOR port to bind to\n"
|
2004-10-14 04:47:09 +02:00
|
|
|
"-p <file>\t\tPID file\n");
|
2004-11-04 07:41:49 +01:00
|
|
|
#endif
|
2003-10-20 03:19:54 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/**
|
2004-10-12 22:22:09 +02:00
|
|
|
* Based on <b>address</b>, guess our public IP address and put it
|
|
|
|
* in <b>addr</b>.
|
2004-05-10 06:48:13 +02:00
|
|
|
*/
|
2004-10-14 04:47:09 +02:00
|
|
|
int
|
|
|
|
resolve_my_address(const char *address, uint32_t *addr)
|
|
|
|
{
|
2004-03-14 19:12:59 +01:00
|
|
|
struct in_addr in;
|
|
|
|
struct hostent *rent;
|
2004-08-16 13:43:18 +02:00
|
|
|
char hostname[256];
|
2004-03-15 05:57:24 +01:00
|
|
|
int explicit_ip=1;
|
2004-03-14 19:12:59 +01:00
|
|
|
|
2004-08-16 13:43:18 +02:00
|
|
|
tor_assert(addr);
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (address) {
|
|
|
|
strlcpy(hostname, address, sizeof(hostname));
|
2004-08-16 13:43:18 +02:00
|
|
|
} else { /* then we need to guess our address */
|
2004-03-15 05:57:24 +01:00
|
|
|
explicit_ip = 0; /* it's implicit */
|
2004-03-14 19:12:59 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (gethostname(hostname, sizeof(hostname)) < 0) {
|
2004-03-14 19:12:59 +01:00
|
|
|
log_fn(LOG_WARN,"Error obtaining local hostname");
|
|
|
|
return -1;
|
|
|
|
}
|
2004-08-16 13:43:18 +02:00
|
|
|
log_fn(LOG_DEBUG,"Guessed local host name as '%s'",hostname);
|
2004-03-14 19:12:59 +01:00
|
|
|
}
|
|
|
|
|
2004-08-16 13:43:18 +02:00
|
|
|
/* now we know hostname. resolve it and keep only the IP */
|
2004-03-14 19:12:59 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (tor_inet_aton(hostname, &in) == 0) {
|
2004-03-15 05:57:24 +01:00
|
|
|
/* then we have to resolve it */
|
|
|
|
explicit_ip = 0;
|
2004-08-16 13:43:18 +02:00
|
|
|
rent = (struct hostent *)gethostbyname(hostname);
|
2004-03-15 05:57:24 +01:00
|
|
|
if (!rent) {
|
2004-08-16 13:43:18 +02:00
|
|
|
log_fn(LOG_WARN,"Could not resolve local Address %s. Failing.", hostname);
|
2004-03-15 05:57:24 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(rent->h_length == 4);
|
2004-10-14 04:47:09 +02:00
|
|
|
memcpy(&in.s_addr, rent->h_addr, rent->h_length);
|
2004-03-14 19:12:59 +01:00
|
|
|
}
|
2004-10-14 04:47:09 +02:00
|
|
|
|
|
|
|
if (!explicit_ip && is_internal_IP(htonl(in.s_addr))) {
|
2004-03-14 23:47:11 +01:00
|
|
|
log_fn(LOG_WARN,"Address '%s' resolves to private IP '%s'. "
|
2004-03-15 05:57:24 +01:00
|
|
|
"Please set the Address config option to be the IP you want to use.",
|
2004-08-16 13:43:18 +02:00
|
|
|
hostname, inet_ntoa(in));
|
2004-03-14 19:12:59 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2004-10-14 04:47:09 +02:00
|
|
|
|
|
|
|
log_fn(LOG_DEBUG, "Resolved Address to %s.", inet_ntoa(in));
|
2004-08-16 13:43:18 +02:00
|
|
|
*addr = ntohl(in.s_addr);
|
2004-03-14 19:12:59 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
static char *
|
|
|
|
get_default_nickname(void)
|
2004-07-13 20:23:40 +02:00
|
|
|
{
|
|
|
|
char localhostname[256];
|
|
|
|
char *cp, *out, *outp;
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (gethostname(localhostname, sizeof(localhostname)) < 0) {
|
2004-07-13 20:23:40 +02:00
|
|
|
log_fn(LOG_WARN,"Error obtaining local hostname");
|
|
|
|
return NULL;
|
|
|
|
}
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-07-13 20:23:40 +02:00
|
|
|
/* Put it in lowercase; stop at the first dot. */
|
2004-10-14 04:47:09 +02:00
|
|
|
for (cp = localhostname; *cp; ++cp) {
|
2004-07-13 20:23:40 +02:00
|
|
|
if (*cp == '.') {
|
|
|
|
*cp = '\0';
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
*cp = tolower(*cp);
|
|
|
|
}
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-07-13 20:23:40 +02:00
|
|
|
/* Strip invalid characters. */
|
|
|
|
cp = localhostname;
|
2004-10-14 04:47:09 +02:00
|
|
|
out = outp = tor_malloc(strlen(localhostname) + 1);
|
2004-07-13 20:23:40 +02:00
|
|
|
while (*cp) {
|
|
|
|
if (strchr(LEGAL_NICKNAME_CHARACTERS, *cp))
|
|
|
|
*outp++ = *cp++;
|
|
|
|
else
|
|
|
|
cp++;
|
|
|
|
}
|
|
|
|
*outp = '\0';
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-07-13 20:23:40 +02:00
|
|
|
/* Enforce length. */
|
|
|
|
if (strlen(out) > MAX_NICKNAME_LEN)
|
|
|
|
out[MAX_NICKNAME_LEN]='\0';
|
|
|
|
|
|
|
|
return out;
|
|
|
|
}
|
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/** Release storage held by <b>options</b> */
|
2004-10-14 04:47:09 +02:00
|
|
|
static void
|
|
|
|
free_options(or_options_t *options)
|
|
|
|
{
|
2004-11-04 09:26:34 +01:00
|
|
|
int i;
|
|
|
|
void *lvalue;
|
|
|
|
|
|
|
|
for (i=0; config_vars[i].name; ++i) {
|
|
|
|
lvalue = ((char*)options) + config_vars[i].var_offset;
|
|
|
|
switch(config_vars[i].type) {
|
|
|
|
case CONFIG_TYPE_UINT:
|
|
|
|
case CONFIG_TYPE_BOOL:
|
|
|
|
case CONFIG_TYPE_DOUBLE:
|
|
|
|
case CONFIG_TYPE_OBSOLETE:
|
|
|
|
break; /* nothing to free for these config types */
|
|
|
|
case CONFIG_TYPE_STRING:
|
|
|
|
tor_free(*(char **)lvalue);
|
|
|
|
break;
|
|
|
|
case CONFIG_TYPE_LINELIST:
|
2004-11-04 23:31:50 +01:00
|
|
|
case CONFIG_TYPE_LINELIST_V:
|
2004-11-04 09:26:34 +01:00
|
|
|
config_free_lines(*(struct config_line_t**)lvalue);
|
|
|
|
*(struct config_line_t**)lvalue = NULL;
|
|
|
|
break;
|
|
|
|
case CONFIG_TYPE_CSV:
|
|
|
|
if (*(smartlist_t**)lvalue) {
|
|
|
|
SMARTLIST_FOREACH(*(smartlist_t**)lvalue, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(*(smartlist_t**)lvalue);
|
|
|
|
*(smartlist_t**)lvalue = NULL;
|
|
|
|
}
|
|
|
|
break;
|
2004-11-04 23:31:50 +01:00
|
|
|
case CONFIG_TYPE_LINELIST_S:
|
|
|
|
/* will be freed by corresponding LINELIST_V. */
|
|
|
|
break;
|
2004-11-04 09:26:34 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
/* XXX this last part is an exception. can we make it not needed? */
|
2004-10-17 00:37:08 +02:00
|
|
|
if (options->RedirectExitList) {
|
2004-10-17 03:57:34 +02:00
|
|
|
SMARTLIST_FOREACH(options->RedirectExitList,
|
|
|
|
exit_redirect_t *, p, tor_free(p));
|
2004-10-17 00:56:46 +02:00
|
|
|
smartlist_free(options->RedirectExitList);
|
2004-10-25 08:16:26 +02:00
|
|
|
options->RedirectExitList = NULL;
|
2004-10-17 00:37:08 +02:00
|
|
|
}
|
2003-10-21 11:48:17 +02:00
|
|
|
}
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2004-11-04 23:31:50 +01:00
|
|
|
/** Replace the option indexed by <b>var</b> in <b>options</b> with its
|
|
|
|
* default value. */
|
|
|
|
static void
|
|
|
|
reset_option(or_options_t *options, config_var_t *var)
|
|
|
|
{
|
|
|
|
struct config_line_t *c;
|
|
|
|
void *lvalue;
|
|
|
|
|
|
|
|
lvalue = ((char*)options) + var->var_offset;
|
|
|
|
switch (var->type) {
|
|
|
|
case CONFIG_TYPE_STRING:
|
|
|
|
tor_free(*(char**)lvalue);
|
|
|
|
break;
|
|
|
|
case CONFIG_TYPE_DOUBLE:
|
|
|
|
*(double*)lvalue = 0.0;
|
|
|
|
break;
|
|
|
|
case CONFIG_TYPE_UINT:
|
|
|
|
case CONFIG_TYPE_BOOL:
|
|
|
|
*(int*)lvalue = 0;
|
|
|
|
break;
|
|
|
|
case CONFIG_TYPE_CSV:
|
|
|
|
if (*(smartlist_t**)lvalue) {
|
|
|
|
SMARTLIST_FOREACH(*(smartlist_t **)lvalue, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(*(smartlist_t **)lvalue);
|
|
|
|
*(smartlist_t **)lvalue = NULL;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case CONFIG_TYPE_LINELIST:
|
|
|
|
case CONFIG_TYPE_LINELIST_S:
|
|
|
|
config_free_lines(*(struct config_line_t **)lvalue);
|
|
|
|
*(struct config_line_t **)lvalue = NULL;
|
|
|
|
break;
|
|
|
|
case CONFIG_TYPE_LINELIST_V:
|
|
|
|
/* handled by linelist_s. */
|
|
|
|
break;
|
|
|
|
case CONFIG_TYPE_OBSOLETE:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (var->initvalue) {
|
|
|
|
c = tor_malloc(sizeof(struct config_line_t));
|
|
|
|
c->key = tor_strdup(var->name);
|
|
|
|
c->value = tor_strdup(var->initvalue);
|
|
|
|
config_assign_line(options,c,0);
|
|
|
|
config_free_lines(c);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
/** Set <b>options</b> to hold reasonable defaults for most options.
|
|
|
|
* Each option defaults to zero. */
|
|
|
|
static void
|
|
|
|
init_options(or_options_t *options)
|
|
|
|
{
|
2004-11-04 09:26:34 +01:00
|
|
|
int i;
|
|
|
|
config_var_t *var;
|
|
|
|
|
2002-11-23 07:49:01 +01:00
|
|
|
memset(options,0,sizeof(or_options_t));
|
2004-11-04 09:26:34 +01:00
|
|
|
for (i=0; config_vars[i].name; ++i) {
|
|
|
|
var = &config_vars[i];
|
|
|
|
if(!var->initvalue)
|
|
|
|
continue; /* defaults to NULL or 0 */
|
2004-11-04 23:31:50 +01:00
|
|
|
reset_option(options, var);
|
2004-11-04 09:26:34 +01:00
|
|
|
}
|
2003-10-21 11:48:17 +02:00
|
|
|
}
|
|
|
|
|
2004-08-18 05:42:55 +02:00
|
|
|
#ifdef MS_WINDOWS
|
2004-10-17 05:38:02 +02:00
|
|
|
static char *get_windows_conf_root(void)
|
|
|
|
{
|
|
|
|
static int is_set = 0;
|
|
|
|
static char path[MAX_PATH+1];
|
|
|
|
|
2004-10-14 04:04:43 +02:00
|
|
|
LPITEMIDLIST idl;
|
|
|
|
IMalloc *m;
|
|
|
|
HRESULT result;
|
2004-10-17 05:38:02 +02:00
|
|
|
|
|
|
|
if (is_set)
|
|
|
|
return path;
|
2004-10-27 04:30:28 +02:00
|
|
|
|
2004-10-14 04:04:43 +02:00
|
|
|
/* Find X:\documents and settings\username\applicatation data\ .
|
|
|
|
* We would use SHGetSpecialFolder path, but that wasn't added until IE4.
|
|
|
|
*/
|
|
|
|
if (!SUCCEEDED(SHGetSpecialFolderLocation(NULL, CSIDL_APPDATA,
|
|
|
|
&idl))) {
|
2004-10-24 02:52:10 +02:00
|
|
|
GetCurrentDirectory(MAX_PATH, path);
|
|
|
|
is_set = 1;
|
|
|
|
log_fn(LOG_WARN, "I couldn't find your application data folder: are you running an ancient version of Windows 95? Defaulting to '%s'", path);
|
|
|
|
return path;
|
2004-10-14 04:04:43 +02:00
|
|
|
}
|
|
|
|
/* Convert the path from an "ID List" (whatever that is!) to a path. */
|
|
|
|
result = SHGetPathFromIDList(idl, path);
|
|
|
|
/* Now we need to free the */
|
|
|
|
SHGetMalloc(&m);
|
|
|
|
if (m) {
|
|
|
|
m->lpVtbl->Free(m, idl);
|
|
|
|
m->lpVtbl->Release(m);
|
|
|
|
}
|
|
|
|
if (!SUCCEEDED(result)) {
|
2004-08-18 05:47:55 +02:00
|
|
|
return NULL;
|
2004-08-18 05:42:55 +02:00
|
|
|
}
|
2004-10-24 02:58:29 +02:00
|
|
|
strlcat(path,"\\tor",MAX_PATH);
|
2004-10-17 05:38:02 +02:00
|
|
|
is_set = 1;
|
|
|
|
return path;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static char *
|
|
|
|
get_default_conf_file(void)
|
|
|
|
{
|
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
char *path = tor_malloc(MAX_PATH);
|
|
|
|
strlcpy(path, get_windows_conf_root(), MAX_PATH);
|
2004-10-24 02:52:10 +02:00
|
|
|
strlcat(path,"\\torrc",MAX_PATH);
|
2004-08-18 05:42:55 +02:00
|
|
|
return path;
|
|
|
|
#else
|
2004-08-18 06:04:08 +02:00
|
|
|
return tor_strdup(CONFDIR "/torrc");
|
2004-08-18 05:42:55 +02:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2004-10-15 03:58:11 +02:00
|
|
|
/** Verify whether lst is a string containing valid-looking space-separated
|
|
|
|
* nicknames, or NULL. Return 0 on success. Warn and return -1 on failure.
|
|
|
|
*/
|
|
|
|
static int check_nickname_list(const char *lst, const char *name)
|
2004-10-15 22:52:09 +02:00
|
|
|
{
|
2004-10-15 03:58:11 +02:00
|
|
|
int r = 0;
|
|
|
|
smartlist_t *sl;
|
|
|
|
|
|
|
|
if (!lst)
|
|
|
|
return 0;
|
|
|
|
sl = smartlist_create();
|
|
|
|
smartlist_split_string(sl, lst, ",", SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
|
|
|
|
SMARTLIST_FOREACH(sl, const char *, s,
|
|
|
|
{
|
|
|
|
if (!is_legal_nickname_or_hexdigest(s)) {
|
|
|
|
log_fn(LOG_WARN, "Invalid nickname '%s' in %s line", s, name);
|
|
|
|
r = -1;
|
|
|
|
}
|
|
|
|
});
|
|
|
|
SMARTLIST_FOREACH(sl, char *, s, tor_free(s));
|
2004-10-15 22:52:09 +02:00
|
|
|
smartlist_free(sl);
|
2004-10-15 03:58:11 +02:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2004-11-04 11:23:30 +01:00
|
|
|
smartlist_t *config_get_default_firewallports(void) {
|
|
|
|
static smartlist_t *answer;
|
2003-11-13 07:49:25 +01:00
|
|
|
|
2004-11-04 11:23:30 +01:00
|
|
|
if(!answer) {
|
|
|
|
answer = smartlist_create();
|
|
|
|
smartlist_add(answer, tor_strdup("80"));
|
|
|
|
smartlist_add(answer, tor_strdup("443"));
|
2003-11-13 07:49:25 +01:00
|
|
|
}
|
2004-11-04 11:23:30 +01:00
|
|
|
return answer;
|
|
|
|
}
|
2003-11-13 07:49:25 +01:00
|
|
|
|
2004-11-04 11:23:30 +01:00
|
|
|
static int
|
|
|
|
validate_options(or_options_t *options)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int result = 0;
|
|
|
|
struct config_line_t *cl;
|
2004-02-29 00:30:41 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->ORPort < 0 || options->ORPort > 65535) {
|
|
|
|
log(LOG_WARN, "ORPort option out of bounds.");
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2004-07-18 23:47:04 +02:00
|
|
|
if (options->Nickname == NULL) {
|
2004-10-14 04:47:09 +02:00
|
|
|
if (server_mode()) {
|
2004-08-04 04:15:22 +02:00
|
|
|
if (!(options->Nickname = get_default_nickname()))
|
|
|
|
return -1;
|
|
|
|
log_fn(LOG_NOTICE, "Choosing default nickname %s", options->Nickname);
|
|
|
|
}
|
2004-07-18 23:47:04 +02:00
|
|
|
} else {
|
|
|
|
if (strspn(options->Nickname, LEGAL_NICKNAME_CHARACTERS) !=
|
|
|
|
strlen(options->Nickname)) {
|
|
|
|
log_fn(LOG_WARN, "Nickname '%s' contains illegal characters.", options->Nickname);
|
|
|
|
result = -1;
|
|
|
|
}
|
2004-08-18 06:44:24 +02:00
|
|
|
if (strlen(options->Nickname) == 0) {
|
|
|
|
log_fn(LOG_WARN, "Nickname must have at least one character");
|
|
|
|
result = -1;
|
|
|
|
}
|
2004-07-18 23:47:04 +02:00
|
|
|
if (strlen(options->Nickname) > MAX_NICKNAME_LEN) {
|
|
|
|
log_fn(LOG_WARN, "Nickname '%s' has more than %d characters.",
|
|
|
|
options->Nickname, MAX_NICKNAME_LEN);
|
|
|
|
result = -1;
|
2004-03-20 21:28:53 +01:00
|
|
|
}
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (server_mode()) {
|
2004-08-16 13:43:18 +02:00
|
|
|
/* confirm that our address isn't broken, so we can complain now */
|
|
|
|
uint32_t tmp;
|
2004-10-14 04:47:09 +02:00
|
|
|
if (resolve_my_address(options->Address, &tmp) < 0)
|
2004-03-14 19:12:59 +01:00
|
|
|
result = -1;
|
2004-03-04 02:53:56 +01:00
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->SocksPort < 0 || options->SocksPort > 65535) {
|
|
|
|
log(LOG_WARN, "SocksPort option out of bounds.");
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->SocksPort == 0 && options->ORPort == 0) {
|
|
|
|
log(LOG_WARN, "SocksPort and ORPort are both undefined? Quitting.");
|
2003-11-10 09:06:55 +01:00
|
|
|
result = -1;
|
2003-12-17 22:09:31 +01:00
|
|
|
}
|
2003-11-10 09:06:55 +01:00
|
|
|
|
2004-11-04 07:41:49 +01:00
|
|
|
if (options->ControlPort < 0 || options->ControlPort > 65535) {
|
|
|
|
log(LOG_WARN, "ControlPort option out of bounds.");
|
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->DirPort < 0 || options->DirPort > 65535) {
|
|
|
|
log(LOG_WARN, "DirPort option out of bounds.");
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2004-11-03 11:08:44 +01:00
|
|
|
if (options->StrictExitNodes &&
|
|
|
|
(!options->ExitNodes || !strlen(options->ExitNodes))) {
|
2004-10-14 04:47:09 +02:00
|
|
|
log(LOG_WARN, "StrictExitNodes set, but no ExitNodes listed.");
|
2004-08-15 22:14:44 +02:00
|
|
|
}
|
|
|
|
|
2004-11-03 11:08:44 +01:00
|
|
|
if (options->StrictEntryNodes &&
|
|
|
|
(!options->EntryNodes || !strlen(options->EntryNodes))) {
|
2004-10-14 04:47:09 +02:00
|
|
|
log(LOG_WARN, "StrictEntryNodes set, but no EntryNodes listed.");
|
2004-08-15 22:14:44 +02:00
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->AuthoritativeDir && options->RecommendedVersions == NULL) {
|
|
|
|
log(LOG_WARN, "Directory servers must configure RecommendedVersions.");
|
2004-03-10 08:44:31 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->AuthoritativeDir && !options->DirPort) {
|
|
|
|
log(LOG_WARN, "Running as authoritative directory, but no DirPort set.");
|
2004-06-21 06:37:27 +02:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->AuthoritativeDir && !options->ORPort) {
|
|
|
|
log(LOG_WARN, "Running as authoritative directory, but no ORPort set.");
|
2004-07-20 12:17:43 +02:00
|
|
|
result = -1;
|
|
|
|
}
|
2004-07-13 09:42:20 +02:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->AuthoritativeDir && options->ClientOnly) {
|
|
|
|
log(LOG_WARN, "Running as authoritative directory, but ClientOnly also set.");
|
2004-07-20 12:17:43 +02:00
|
|
|
result = -1;
|
|
|
|
}
|
2004-07-13 09:42:20 +02:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->FirewallPorts) {
|
2004-08-16 22:47:00 +02:00
|
|
|
SMARTLIST_FOREACH(options->FirewallPorts, const char *, cp,
|
2004-10-14 04:47:09 +02:00
|
|
|
{
|
|
|
|
i = atoi(cp);
|
2004-08-16 22:47:00 +02:00
|
|
|
if (i < 1 || i > 65535) {
|
2004-08-17 07:13:58 +02:00
|
|
|
log(LOG_WARN, "Port '%s' out of range in FirewallPorts", cp);
|
|
|
|
result=-1;
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
options->_AllowUnverified = 0;
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->AllowUnverifiedNodes) {
|
|
|
|
SMARTLIST_FOREACH(options->AllowUnverifiedNodes, const char *, cp, {
|
|
|
|
if (!strcasecmp(cp, "entry"))
|
|
|
|
options->_AllowUnverified |= ALLOW_UNVERIFIED_ENTRY;
|
|
|
|
else if (!strcasecmp(cp, "exit"))
|
|
|
|
options->_AllowUnverified |= ALLOW_UNVERIFIED_EXIT;
|
|
|
|
else if (!strcasecmp(cp, "middle"))
|
|
|
|
options->_AllowUnverified |= ALLOW_UNVERIFIED_MIDDLE;
|
|
|
|
else if (!strcasecmp(cp, "introduction"))
|
|
|
|
options->_AllowUnverified |= ALLOW_UNVERIFIED_INTRODUCTION;
|
|
|
|
else if (!strcasecmp(cp, "rendezvous"))
|
|
|
|
options->_AllowUnverified |= ALLOW_UNVERIFIED_RENDEZVOUS;
|
|
|
|
else {
|
|
|
|
log(LOG_WARN, "Unrecognized value '%s' in AllowUnverifiedNodes",
|
|
|
|
cp);
|
|
|
|
result=-1;
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
if (options->SocksPort >= 1 &&
|
|
|
|
(options->PathlenCoinWeight < 0.0 || options->PathlenCoinWeight >= 1.0)) {
|
|
|
|
log(LOG_WARN, "PathlenCoinWeight option must be >=0.0 and <1.0.");
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->MaxConn < 1) {
|
|
|
|
log(LOG_WARN, "MaxConn option must be a non-zero positive integer.");
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->MaxConn >= MAXCONNECTIONS) {
|
|
|
|
log(LOG_WARN, "MaxConn option must be less than %d.", MAXCONNECTIONS);
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2004-09-23 21:23:32 +02:00
|
|
|
#define MIN_DIRFETCHPOSTPERIOD 60
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->DirFetchPostPeriod < MIN_DIRFETCHPOSTPERIOD) {
|
|
|
|
log(LOG_WARN, "DirFetchPostPeriod option must be at least %d.", MIN_DIRFETCHPOSTPERIOD);
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->DirFetchPostPeriod > MIN_ONION_KEY_LIFETIME / 2) {
|
|
|
|
log(LOG_WARN, "DirFetchPostPeriod is too large; clipping.");
|
|
|
|
options->DirFetchPostPeriod = MIN_ONION_KEY_LIFETIME / 2;
|
2004-04-25 00:17:50 +02:00
|
|
|
}
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->KeepalivePeriod < 1) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log(LOG_WARN,"KeepalivePeriod option must be positive.");
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2004-11-03 00:47:32 +01:00
|
|
|
if (options->AccountingStart < 0 || options->AccountingStart > 31) {
|
2004-11-04 00:13:28 +01:00
|
|
|
log(LOG_WARN,"Monthly accounting must start on a day of the month, and no months have %d days.",
|
2004-11-03 00:47:32 +01:00
|
|
|
options->AccountingStart);
|
|
|
|
result = -1;
|
|
|
|
} else if (options->AccountingStart > 28) {
|
|
|
|
log(LOG_WARN,"Not every month has %d days.",options->AccountingStart);
|
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->HttpProxy) { /* parse it now */
|
|
|
|
if (parse_addr_port(options->HttpProxy, NULL,
|
|
|
|
&options->HttpProxyAddr, &options->HttpProxyPort) < 0) {
|
2004-10-12 22:22:09 +02:00
|
|
|
log(LOG_WARN,"HttpProxy failed to parse or resolve. Please fix.");
|
|
|
|
result = -1;
|
|
|
|
}
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->HttpProxyPort == 0) { /* give it a default */
|
2004-10-12 22:22:09 +02:00
|
|
|
options->HttpProxyPort = 80;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-10-15 03:58:11 +02:00
|
|
|
if (check_nickname_list(options->ExitNodes, "ExitNodes"))
|
2004-11-04 11:23:30 +01:00
|
|
|
result = -1;
|
2004-10-15 03:58:11 +02:00
|
|
|
if (check_nickname_list(options->EntryNodes, "EntryNodes"))
|
2004-11-04 11:23:30 +01:00
|
|
|
result = -1;
|
2004-10-15 03:58:11 +02:00
|
|
|
if (check_nickname_list(options->ExcludeNodes, "ExcludeNodes"))
|
2004-11-04 11:23:30 +01:00
|
|
|
result = -1;
|
2004-10-15 03:58:11 +02:00
|
|
|
if (check_nickname_list(options->RendNodes, "RendNodes"))
|
2004-11-04 11:23:30 +01:00
|
|
|
result = -1;
|
2004-10-15 03:58:11 +02:00
|
|
|
if (check_nickname_list(options->RendNodes, "RendExcludeNodes"))
|
2004-11-04 11:23:30 +01:00
|
|
|
result = -1;
|
2004-10-15 03:58:11 +02:00
|
|
|
if (check_nickname_list(options->MyFamily, "MyFamily"))
|
2004-11-04 11:23:30 +01:00
|
|
|
result = -1;
|
2004-10-15 22:52:09 +02:00
|
|
|
for (cl = options->NodeFamilies; cl; cl = cl->next) {
|
|
|
|
if (check_nickname_list(cl->value, "NodeFamily"))
|
2004-11-04 11:23:30 +01:00
|
|
|
result = -1;
|
2004-10-15 22:52:09 +02:00
|
|
|
}
|
|
|
|
|
2004-10-17 00:37:08 +02:00
|
|
|
if (!options->RedirectExitList)
|
|
|
|
options->RedirectExitList = smartlist_create();
|
2004-11-04 11:23:30 +01:00
|
|
|
/* XXX need to free the old one if it's there, else they just keep piling up */
|
2004-10-17 00:37:08 +02:00
|
|
|
for (cl = options->RedirectExit; cl; cl = cl->next) {
|
|
|
|
if (parse_redirect_line(options, cl)<0)
|
2004-11-04 11:23:30 +01:00
|
|
|
result = -1;
|
2004-10-17 00:37:08 +02:00
|
|
|
}
|
|
|
|
|
2004-10-13 21:55:40 +02:00
|
|
|
clear_trusted_dir_servers();
|
|
|
|
if (!options->DirServers) {
|
|
|
|
add_default_trusted_dirservers();
|
|
|
|
} else {
|
|
|
|
for (cl = options->DirServers; cl; cl = cl->next) {
|
|
|
|
if (parse_dir_server_line(cl->value)<0)
|
2004-11-04 11:23:30 +01:00
|
|
|
result = -1;
|
2004-10-13 21:55:40 +02:00
|
|
|
}
|
2004-10-12 17:55:20 +02:00
|
|
|
}
|
|
|
|
|
2004-11-04 11:23:30 +01:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Read a configuration file into <b>options</b>, finding the configuration
|
|
|
|
* file location based on the command line. After loading the options,
|
|
|
|
* validate them for consistency. Return 0 if success, <0 if failure. */
|
|
|
|
int
|
|
|
|
getconfig(int argc, char **argv, or_options_t *options)
|
|
|
|
{
|
|
|
|
struct config_line_t *cl;
|
|
|
|
FILE *cf;
|
|
|
|
char *fname;
|
|
|
|
int i;
|
|
|
|
int result = 0;
|
|
|
|
int using_default_torrc;
|
|
|
|
static char **backup_argv;
|
|
|
|
static int backup_argc;
|
|
|
|
char *previous_pidfile = NULL;
|
|
|
|
int previous_runasdaemon = 0;
|
|
|
|
int previous_orport = -1;
|
|
|
|
|
|
|
|
if (argv) { /* first time we're called. save commandline args */
|
|
|
|
backup_argv = argv;
|
|
|
|
backup_argc = argc;
|
|
|
|
} else { /* we're reloading. need to clean up old options first. */
|
|
|
|
argv = backup_argv;
|
|
|
|
argc = backup_argc;
|
|
|
|
|
|
|
|
/* record some previous values, so we can fail if they change */
|
|
|
|
if (options->PidFile)
|
|
|
|
previous_pidfile = tor_strdup(options->PidFile);
|
|
|
|
previous_runasdaemon = options->RunAsDaemon;
|
|
|
|
previous_orport = options->ORPort;
|
|
|
|
free_options(options);
|
|
|
|
}
|
|
|
|
init_options(options);
|
|
|
|
|
|
|
|
if (argc > 1 && (!strcmp(argv[1], "-h") || !strcmp(argv[1],"--help"))) {
|
|
|
|
print_usage();
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (argc > 1 && (!strcmp(argv[1],"--version"))) {
|
|
|
|
printf("Tor version %s.\n",VERSION);
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* learn config file name, get config lines, assign them */
|
|
|
|
fname = NULL;
|
|
|
|
using_default_torrc = 1;
|
|
|
|
options->command = CMD_RUN_TOR;
|
|
|
|
for (i = 1; i < argc; ++i) {
|
|
|
|
if (i < argc-1 && !strcmp(argv[i],"-f")) {
|
|
|
|
if (fname) {
|
|
|
|
log(LOG_WARN, "Duplicate -f options on command line.");
|
|
|
|
tor_free(fname);
|
|
|
|
}
|
|
|
|
fname = tor_strdup(argv[i+1]);
|
|
|
|
using_default_torrc = 0;
|
|
|
|
++i;
|
|
|
|
} else if (!strcmp(argv[i],"--list-fingerprint")) {
|
|
|
|
options->command = CMD_LIST_FINGERPRINT;
|
|
|
|
} else if (!strcmp(argv[i],"--hash-password")) {
|
|
|
|
options->command = CMD_HASH_PASSWORD;
|
|
|
|
options->command_arg = tor_strdup( (i < argc-1) ? argv[i+1] : "");
|
|
|
|
++i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (using_default_torrc) {
|
|
|
|
/* didn't find one, try CONFDIR */
|
|
|
|
char *fn;
|
|
|
|
fn = get_default_conf_file();
|
|
|
|
if (fn && file_status(fn) == FN_FILE) {
|
|
|
|
fname = fn;
|
|
|
|
} else {
|
|
|
|
tor_free(fn);
|
|
|
|
fn = expand_filename("~/.torrc");
|
|
|
|
if (fn && file_status(fn) == FN_FILE) {
|
|
|
|
fname = fn;
|
|
|
|
} else {
|
|
|
|
tor_free(fn);
|
|
|
|
fname = get_default_conf_file();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
tor_assert(fname);
|
|
|
|
log(LOG_DEBUG, "Opening config file '%s'", fname);
|
|
|
|
|
|
|
|
cf = fopen(fname, "r");
|
|
|
|
if (!cf) {
|
|
|
|
if (using_default_torrc == 1) {
|
|
|
|
log(LOG_NOTICE, "Configuration file '%s' not present, "
|
|
|
|
"using reasonable defaults.", fname);
|
|
|
|
tor_free(fname);
|
|
|
|
} else {
|
|
|
|
log(LOG_WARN, "Unable to open configuration file '%s'.", fname);
|
|
|
|
tor_free(fname);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
} else { /* it opened successfully. use it. */
|
|
|
|
tor_free(fname);
|
|
|
|
if (config_get_lines(cf, &cl)<0)
|
|
|
|
return -1;
|
2004-11-04 23:31:50 +01:00
|
|
|
if (config_assign(options,cl, 0) < 0)
|
2004-11-04 11:23:30 +01:00
|
|
|
return -1;
|
|
|
|
config_free_lines(cl);
|
|
|
|
fclose(cf);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* go through command-line variables too */
|
|
|
|
cl = config_get_commandlines(argc,argv);
|
2004-11-04 23:31:50 +01:00
|
|
|
if (config_assign(options,cl,0) < 0)
|
2004-11-04 11:23:30 +01:00
|
|
|
return -1;
|
|
|
|
config_free_lines(cl);
|
|
|
|
|
|
|
|
/* Validate options */
|
|
|
|
|
|
|
|
/* first check if any of the previous options have changed but aren't allowed to */
|
|
|
|
if (previous_pidfile && strcmp(previous_pidfile,options->PidFile)) {
|
|
|
|
log_fn(LOG_WARN,"During reload, PidFile changed from %s to %s. Failing.",
|
|
|
|
previous_pidfile, options->PidFile);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
tor_free(previous_pidfile);
|
|
|
|
|
|
|
|
if (previous_runasdaemon && !options->RunAsDaemon) {
|
|
|
|
log_fn(LOG_WARN,"During reload, change from RunAsDaemon=1 to =0 not allowed. Failing.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (previous_orport == 0 && options->ORPort > 0) {
|
|
|
|
log_fn(LOG_WARN,"During reload, change from ORPort=0 to >0 not allowed. Failing.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (validate_options(options) < 0)
|
|
|
|
result = -1;
|
|
|
|
|
2004-03-31 23:35:23 +02:00
|
|
|
if (rend_config_services(options) < 0) {
|
|
|
|
result = -1;
|
|
|
|
}
|
2002-11-23 07:49:01 +01:00
|
|
|
return result;
|
2002-07-03 18:31:22 +02:00
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
static int
|
|
|
|
add_single_log(struct config_line_t *level_opt,
|
|
|
|
struct config_line_t *file_opt, int isDaemon)
|
2004-05-19 22:07:08 +02:00
|
|
|
{
|
2004-10-14 04:47:09 +02:00
|
|
|
int levelMin = -1, levelMax = -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
char *cp, *tmp_sev;
|
|
|
|
|
|
|
|
if (level_opt) {
|
|
|
|
cp = strchr(level_opt->value, '-');
|
|
|
|
if (cp) {
|
|
|
|
tmp_sev = tor_strndup(level_opt->value, cp - level_opt->value);
|
|
|
|
levelMin = parse_log_level(tmp_sev);
|
2004-10-14 04:47:09 +02:00
|
|
|
if (levelMin < 0) {
|
|
|
|
log_fn(LOG_WARN, "Unrecognized log severity '%s': must be one of "
|
|
|
|
"err|warn|notice|info|debug", tmp_sev);
|
2004-05-20 21:47:28 +02:00
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
}
|
|
|
|
tor_free(tmp_sev);
|
|
|
|
levelMax = parse_log_level(cp+1);
|
2004-10-14 04:47:09 +02:00
|
|
|
if (levelMax < 0) {
|
|
|
|
log_fn(LOG_WARN, "Unrecognized log severity '%s': must be one of "
|
|
|
|
"err|warn|notice|info|debug", cp+1);
|
2004-05-20 21:47:28 +02:00
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
levelMin = parse_log_level(level_opt->value);
|
2004-10-14 04:47:09 +02:00
|
|
|
if (levelMin < 0) {
|
|
|
|
log_fn(LOG_WARN, "Unrecognized log severity '%s': must be one of "
|
|
|
|
"err|warn|notice|info|debug", level_opt->value);
|
2004-05-20 21:47:28 +02:00
|
|
|
return -1;
|
|
|
|
|
2004-05-19 22:07:08 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (levelMin < 0 && levelMax < 0) {
|
|
|
|
levelMin = LOG_NOTICE;
|
|
|
|
levelMax = LOG_ERR;
|
|
|
|
} else if (levelMin < 0) {
|
|
|
|
levelMin = levelMax;
|
|
|
|
} else {
|
|
|
|
levelMax = LOG_ERR;
|
|
|
|
}
|
2004-10-26 23:48:41 +02:00
|
|
|
|
|
|
|
if (file_opt && !strcasecmp(file_opt->key, "LogFile")) {
|
2004-05-19 22:07:08 +02:00
|
|
|
if (add_file_log(levelMin, levelMax, file_opt->value) < 0) {
|
|
|
|
log_fn(LOG_WARN, "Cannot write to LogFile '%s': %s.", file_opt->value,
|
|
|
|
strerror(errno));
|
2004-05-20 21:47:28 +02:00
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
}
|
|
|
|
log_fn(LOG_NOTICE, "Successfully opened LogFile '%s', redirecting output.",
|
|
|
|
file_opt->value);
|
2004-10-26 23:48:41 +02:00
|
|
|
} else if (file_opt && !strcasecmp(file_opt->key, "SysLog")) {
|
|
|
|
#ifdef HAVE_SYSLOG_H
|
|
|
|
if (add_syslog_log(levelMin, levelMax) < 0) {
|
|
|
|
log_fn(LOG_WARN, "Cannot open system log facility");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
log_fn(LOG_NOTICE, "Successfully opened system log, redirecting output.");
|
|
|
|
#else
|
|
|
|
log_fn(LOG_WARN, "Tor was compiled without system logging enabled; can't enable SysLog.");
|
|
|
|
#endif
|
2004-05-19 22:07:08 +02:00
|
|
|
} else if (!isDaemon) {
|
2004-05-19 23:40:44 +02:00
|
|
|
add_stream_log(levelMin, levelMax, "<stdout>", stdout);
|
2004-05-20 21:47:28 +02:00
|
|
|
close_temp_logs();
|
2004-05-19 22:07:08 +02:00
|
|
|
}
|
2004-05-20 21:47:28 +02:00
|
|
|
return 0;
|
2004-05-19 22:07:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Initialize the logs based on the configuration file.
|
|
|
|
*/
|
2004-10-14 04:47:09 +02:00
|
|
|
int
|
|
|
|
config_init_logs(or_options_t *options)
|
2004-05-19 22:07:08 +02:00
|
|
|
{
|
|
|
|
/* The order of options is: Level? (File Level?)+
|
|
|
|
*/
|
|
|
|
struct config_line_t *opt = options->LogOptions;
|
|
|
|
|
2004-05-20 21:47:28 +02:00
|
|
|
/* Special case if no options are given. */
|
|
|
|
if (!opt) {
|
|
|
|
add_stream_log(LOG_NOTICE, LOG_ERR, "<stdout>", stdout);
|
|
|
|
close_temp_logs();
|
2004-05-20 10:41:54 +02:00
|
|
|
/* don't return yet, in case we want to do a debuglogfile below */
|
|
|
|
}
|
2004-05-20 10:15:28 +02:00
|
|
|
|
2004-05-19 22:07:08 +02:00
|
|
|
/* Special case for if first option is LogLevel. */
|
|
|
|
if (opt && !strcasecmp(opt->key, "LogLevel")) {
|
2004-10-26 23:48:41 +02:00
|
|
|
if (opt->next && (!strcasecmp(opt->next->key, "LogFile") ||
|
|
|
|
!strcasecmp(opt->next->key, "SysLog"))) {
|
2004-10-14 04:47:09 +02:00
|
|
|
if (add_single_log(opt, opt->next, options->RunAsDaemon) < 0)
|
2004-05-20 21:47:28 +02:00
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
opt = opt->next->next;
|
|
|
|
} else if (!opt->next) {
|
2004-10-14 04:47:09 +02:00
|
|
|
if (add_single_log(opt, NULL, options->RunAsDaemon) < 0)
|
2004-05-20 21:47:28 +02:00
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
opt = opt->next;
|
2004-05-20 21:47:28 +02:00
|
|
|
} else {
|
|
|
|
; /* give warning below */
|
2004-05-19 22:07:08 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
while (opt) {
|
|
|
|
if (!strcasecmp(opt->key, "LogLevel")) {
|
2004-10-26 23:48:41 +02:00
|
|
|
log_fn(LOG_WARN, "Two LogLevel options in a row without intervening LogFile or SysLog");
|
2004-05-19 22:07:08 +02:00
|
|
|
opt = opt->next;
|
|
|
|
} else {
|
2004-10-26 23:48:41 +02:00
|
|
|
tor_assert(!strcasecmp(opt->key, "LogFile") ||
|
|
|
|
!strcasecmp(opt->key, "SysLog"));
|
2004-05-19 22:07:08 +02:00
|
|
|
if (opt->next && !strcasecmp(opt->next->key, "LogLevel")) {
|
2004-10-26 23:48:41 +02:00
|
|
|
/* LogFile/SysLog followed by LogLevel */
|
2004-10-14 04:47:09 +02:00
|
|
|
if (add_single_log(opt->next, opt, options->RunAsDaemon) < 0)
|
2004-05-20 21:47:28 +02:00
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
opt = opt->next->next;
|
|
|
|
} else {
|
2004-10-26 23:48:41 +02:00
|
|
|
/* LogFile/SysLog followed by LogFile/SysLog or end of list. */
|
2004-10-14 04:47:09 +02:00
|
|
|
if (add_single_log(NULL, opt, options->RunAsDaemon) < 0)
|
2004-05-20 21:47:28 +02:00
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
opt = opt->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (options->DebugLogFile) {
|
|
|
|
log_fn(LOG_WARN, "DebugLogFile is deprecated; use LogFile and LogLevel instead");
|
2004-10-14 04:47:09 +02:00
|
|
|
if (add_file_log(LOG_DEBUG, LOG_ERR, options->DebugLogFile) < 0)
|
2004-05-20 21:47:28 +02:00
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
}
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-05-20 21:47:28 +02:00
|
|
|
return 0;
|
2004-05-19 22:07:08 +02:00
|
|
|
}
|
|
|
|
|
2004-08-18 23:56:45 +02:00
|
|
|
/**
|
|
|
|
* Given a linked list of config lines containing "allow" and "deny" tokens,
|
|
|
|
* parse them and place the result in <b>dest</b>. Skip malformed lines.
|
|
|
|
*/
|
2004-05-20 04:42:50 +02:00
|
|
|
void
|
|
|
|
config_parse_exit_policy(struct config_line_t *cfg,
|
|
|
|
struct exit_policy_t **dest)
|
|
|
|
{
|
|
|
|
struct exit_policy_t **nextp;
|
2004-09-02 20:39:59 +02:00
|
|
|
smartlist_t *entries;
|
2004-05-20 04:42:50 +02:00
|
|
|
|
|
|
|
if (!cfg)
|
|
|
|
return;
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-05-20 04:42:50 +02:00
|
|
|
nextp = dest;
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-05-20 04:42:50 +02:00
|
|
|
while (*nextp)
|
|
|
|
nextp = &((*nextp)->next);
|
|
|
|
|
2004-09-02 20:39:59 +02:00
|
|
|
entries = smartlist_create();
|
2004-05-20 04:42:50 +02:00
|
|
|
for (; cfg; cfg = cfg->next) {
|
2004-10-14 04:47:09 +02:00
|
|
|
smartlist_split_string(entries, cfg->value, ",", SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
|
|
|
|
SMARTLIST_FOREACH(entries, const char *, ent,
|
|
|
|
{
|
2004-09-02 20:39:59 +02:00
|
|
|
log_fn(LOG_DEBUG,"Adding new entry '%s'",ent);
|
|
|
|
*nextp = router_parse_exit_policy_from_string(ent);
|
2004-10-14 04:47:09 +02:00
|
|
|
if (*nextp) {
|
2004-05-20 04:42:50 +02:00
|
|
|
nextp = &((*nextp)->next);
|
|
|
|
} else {
|
2004-09-02 20:39:59 +02:00
|
|
|
log_fn(LOG_WARN,"Malformed exit policy %s; skipping.", ent);
|
2004-05-20 04:42:50 +02:00
|
|
|
}
|
2004-09-02 20:39:59 +02:00
|
|
|
});
|
|
|
|
SMARTLIST_FOREACH(entries, char *, ent, tor_free(ent));
|
|
|
|
smartlist_clear(entries);
|
2004-05-20 04:42:50 +02:00
|
|
|
}
|
2004-09-02 20:39:59 +02:00
|
|
|
smartlist_free(entries);
|
2004-05-20 04:42:50 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void exit_policy_free(struct exit_policy_t *p) {
|
|
|
|
struct exit_policy_t *e;
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-05-20 04:42:50 +02:00
|
|
|
while (p) {
|
|
|
|
e = p;
|
|
|
|
p = p->next;
|
|
|
|
tor_free(e->string);
|
|
|
|
tor_free(e);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-10-17 00:56:46 +02:00
|
|
|
static int parse_redirect_line(or_options_t *options,
|
2004-10-17 00:37:08 +02:00
|
|
|
struct config_line_t *line)
|
|
|
|
{
|
|
|
|
smartlist_t *elements = NULL;
|
|
|
|
exit_redirect_t *r;
|
|
|
|
|
|
|
|
tor_assert(options);
|
|
|
|
tor_assert(options->RedirectExitList);
|
|
|
|
tor_assert(line);
|
|
|
|
|
|
|
|
r = tor_malloc_zero(sizeof(exit_redirect_t));
|
2004-10-17 06:44:02 +02:00
|
|
|
elements = smartlist_create();
|
2004-10-17 00:37:08 +02:00
|
|
|
smartlist_split_string(elements, line->value, " ",
|
|
|
|
SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
|
|
|
|
if (smartlist_len(elements) != 2) {
|
|
|
|
log_fn(LOG_WARN, "Wrong number of elements in RedirectExit line");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (parse_addr_and_port_range(smartlist_get(elements,0),&r->addr,&r->mask,
|
|
|
|
&r->port_min,&r->port_max)) {
|
|
|
|
log_fn(LOG_WARN, "Error parsing source address in RedirectExit line");
|
|
|
|
goto err;
|
|
|
|
}
|
2004-10-19 19:46:06 +02:00
|
|
|
if (0==strcasecmp(smartlist_get(elements,1), "pass")) {
|
|
|
|
r->is_redirect = 0;
|
|
|
|
} else {
|
|
|
|
if (parse_addr_port(smartlist_get(elements,1),NULL,&r->addr_dest,
|
|
|
|
&r->port_dest)) {
|
|
|
|
log_fn(LOG_WARN, "Error parseing dest address in RedirectExit line");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
r->is_redirect = 1;
|
2004-10-17 00:37:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
goto done;
|
|
|
|
err:
|
|
|
|
tor_free(r);
|
|
|
|
done:
|
|
|
|
SMARTLIST_FOREACH(elements, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(elements);
|
|
|
|
if (r) {
|
|
|
|
smartlist_add(options->RedirectExitList, r);
|
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-10-12 17:55:20 +02:00
|
|
|
static int parse_dir_server_line(const char *line)
|
|
|
|
{
|
|
|
|
smartlist_t *items = NULL;
|
|
|
|
int r;
|
|
|
|
char *addrport, *address=NULL;
|
|
|
|
uint16_t port;
|
|
|
|
char digest[DIGEST_LEN];
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-10-12 17:55:20 +02:00
|
|
|
items = smartlist_create();
|
|
|
|
smartlist_split_string(items, line, " ",
|
|
|
|
SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 2);
|
|
|
|
if (smartlist_len(items) < 2) {
|
2004-10-14 04:47:09 +02:00
|
|
|
log_fn(LOG_WARN, "Too few arguments to DirServer line.");
|
|
|
|
goto err;
|
2004-10-12 17:55:20 +02:00
|
|
|
}
|
|
|
|
addrport = smartlist_get(items, 0);
|
|
|
|
if (parse_addr_port(addrport, &address, NULL, &port)<0) {
|
2004-10-14 04:47:09 +02:00
|
|
|
log_fn(LOG_WARN, "Error parsing DirServer address '%s'", addrport);
|
|
|
|
goto err;
|
2004-10-12 17:55:20 +02:00
|
|
|
}
|
|
|
|
if (!port) {
|
2004-10-14 04:47:09 +02:00
|
|
|
log_fn(LOG_WARN, "Missing port in DirServe address '%s'",addrport);
|
|
|
|
goto err;
|
2004-10-12 17:55:20 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
tor_strstrip(smartlist_get(items, 1), " ");
|
|
|
|
if (strlen(smartlist_get(items, 1)) != HEX_DIGEST_LEN) {
|
2004-10-14 04:47:09 +02:00
|
|
|
log_fn(LOG_WARN, "Key digest for DirServer is wrong length.");
|
|
|
|
goto err;
|
2004-10-12 17:55:20 +02:00
|
|
|
}
|
|
|
|
if (base16_decode(digest, DIGEST_LEN,
|
|
|
|
smartlist_get(items,1), HEX_DIGEST_LEN)<0) {
|
2004-10-14 04:47:09 +02:00
|
|
|
log_fn(LOG_WARN, "Unable to decode DirServer key digest.");
|
|
|
|
goto err;
|
2004-10-12 17:55:20 +02:00
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
log_fn(LOG_DEBUG, "Trusted dirserver at %s:%d (%s)", address, (int)port,
|
2004-10-13 20:28:39 +02:00
|
|
|
(char*)smartlist_get(items,1));
|
2004-10-12 17:55:20 +02:00
|
|
|
add_trusted_dir_server(address, port, digest);
|
|
|
|
|
|
|
|
r = 0;
|
|
|
|
goto done;
|
2004-10-14 04:47:09 +02:00
|
|
|
|
|
|
|
err:
|
2004-10-12 17:55:20 +02:00
|
|
|
r = -1;
|
2004-10-14 04:47:09 +02:00
|
|
|
|
|
|
|
done:
|
2004-10-12 17:55:20 +02:00
|
|
|
SMARTLIST_FOREACH(items, char*, s, tor_free(s));
|
|
|
|
smartlist_free(items);
|
2004-10-14 04:47:09 +02:00
|
|
|
|
|
|
|
if (address)
|
|
|
|
tor_free(address);
|
|
|
|
|
2004-10-12 17:55:20 +02:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
const char *
|
|
|
|
get_data_directory(or_options_t *options)
|
|
|
|
{
|
2004-06-21 06:37:27 +02:00
|
|
|
const char *d;
|
2004-10-14 04:47:09 +02:00
|
|
|
|
|
|
|
if (options->DataDirectory) {
|
2004-06-21 06:37:27 +02:00
|
|
|
d = options->DataDirectory;
|
2004-10-14 04:47:09 +02:00
|
|
|
} else {
|
2004-08-18 05:42:55 +02:00
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
char *p;
|
2004-08-18 05:47:55 +02:00
|
|
|
p = tor_malloc(MAX_PATH);
|
2004-10-17 05:38:02 +02:00
|
|
|
strlcpy(p,get_windows_conf_root(),MAX_PATH);
|
2004-08-18 05:42:55 +02:00
|
|
|
options->DataDirectory = p;
|
2004-08-18 05:47:55 +02:00
|
|
|
return p;
|
2004-08-18 05:42:55 +02:00
|
|
|
#else
|
2004-06-21 06:37:27 +02:00
|
|
|
d = "~/.tor";
|
2004-08-18 05:42:55 +02:00
|
|
|
#endif
|
2004-09-08 08:52:33 +02:00
|
|
|
}
|
2004-10-14 04:47:09 +02:00
|
|
|
|
|
|
|
if (d && strncmp(d,"~/",2) == 0) {
|
2004-07-16 21:43:58 +02:00
|
|
|
char *fn = expand_filename(d);
|
2004-10-14 04:47:09 +02:00
|
|
|
if (!fn) {
|
|
|
|
log_fn(LOG_ERR,"Failed to expand filename '%s'. Exiting.", d);
|
2004-09-10 23:40:29 +02:00
|
|
|
exit(1);
|
2004-09-10 21:16:01 +02:00
|
|
|
}
|
2004-06-21 06:37:27 +02:00
|
|
|
tor_free(options->DataDirectory);
|
2004-07-16 21:43:58 +02:00
|
|
|
options->DataDirectory = fn;
|
2004-06-21 06:37:27 +02:00
|
|
|
}
|
|
|
|
return options->DataDirectory;
|
|
|
|
}
|
|
|
|
|
2003-04-07 04:12:02 +02:00
|
|
|
/*
|
|
|
|
Local Variables:
|
|
|
|
mode:c
|
|
|
|
indent-tabs-mode:nil
|
|
|
|
c-basic-offset:2
|
|
|
|
End:
|
|
|
|
*/
|