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 */
|
|
|
|
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-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-05-19 22:07:08 +02:00
|
|
|
static int config_compare(struct config_line_t *c, const char *key, config_type_t type, void *arg);
|
2004-03-31 23:35:23 +02:00
|
|
|
static int config_assign(or_options_t *options, struct config_line_t *list);
|
2004-10-12 17:55:20 +02:00
|
|
|
static int parse_dir_server_line(const char *line);
|
2003-09-08 07:16:18 +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) {
|
|
|
|
if (!strcmp(argv[i],"-f")) {
|
2002-11-23 07:49:01 +01:00
|
|
|
// log(LOG_DEBUG,"Commandline: skipping over -f.");
|
2004-10-14 04:47:09 +02:00
|
|
|
i += 2; /* this is the config file option. ignore it. */
|
2002-11-23 07:49:01 +01:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
|
2003-10-04 05:29:09 +02:00
|
|
|
new->key = tor_strdup(s);
|
|
|
|
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-03-31 23:35:23 +02:00
|
|
|
static struct config_line_t *
|
|
|
|
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;
|
|
|
|
} else {
|
|
|
|
*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-05-10 06:48:13 +02:00
|
|
|
/** Search the linked list <b>c</b> for any option whose key is <b>key</b>.
|
|
|
|
* If such an option is found, interpret it as of type <b>type</b>, and store
|
|
|
|
* the result in <b>arg</b>. If the option is misformatted, log a warning and
|
|
|
|
* skip it.
|
|
|
|
*/
|
2004-10-14 04:47:09 +02:00
|
|
|
static int
|
|
|
|
config_compare(struct config_line_t *c, const char *key,
|
|
|
|
config_type_t type, void *arg)
|
|
|
|
{
|
2004-10-12 22:22:09 +02:00
|
|
|
int i, ok;
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (strncasecmp(c->key, key, strlen(c->key)))
|
2002-11-23 07:49:01 +01:00
|
|
|
return 0;
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (strcasecmp(c->key, key)) {
|
2004-05-19 22:07:08 +02:00
|
|
|
tor_free(c->key);
|
|
|
|
c->key = tor_strdup(key);
|
|
|
|
}
|
|
|
|
|
2002-11-23 07:49:01 +01:00
|
|
|
/* it's a match. cast and assign. */
|
2004-10-14 04:47:09 +02:00
|
|
|
log_fn(LOG_DEBUG, "Recognized keyword '%s' as %s, using value '%s'.",
|
|
|
|
c->key, key, c->value);
|
2002-11-23 07:49:01 +01:00
|
|
|
|
|
|
|
switch(type) {
|
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;
|
|
|
|
}
|
|
|
|
*(int *)arg = i;
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
*(int *)arg = i;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CONFIG_TYPE_STRING:
|
|
|
|
tor_free(*(char **)arg);
|
|
|
|
*(char **)arg = tor_strdup(c->value);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CONFIG_TYPE_DOUBLE:
|
|
|
|
*(double *)arg = atof(c->value);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CONFIG_TYPE_CSV:
|
|
|
|
if (*(smartlist_t**)arg == NULL)
|
|
|
|
*(smartlist_t**)arg = smartlist_create();
|
|
|
|
|
|
|
|
smartlist_split_string(*(smartlist_t**)arg, c->value, ",",
|
|
|
|
SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
|
|
|
|
break;
|
|
|
|
|
2004-03-31 23:35:23 +02:00
|
|
|
case CONFIG_TYPE_LINELIST:
|
|
|
|
/* 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**)arg =
|
|
|
|
config_line_prepend(*(struct config_line_t**)arg, 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;
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2002-11-23 07:49:01 +01:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/** Iterate through the linked list of options <b>list</b>.
|
|
|
|
* 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,
|
|
|
|
* else return 0 for success. */
|
2004-10-14 04:47:09 +02:00
|
|
|
static int
|
|
|
|
config_assign(or_options_t *options, struct config_line_t *list)
|
|
|
|
{
|
|
|
|
while (list) {
|
|
|
|
if (
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
/* order matters here! abbreviated arguments use the first match. */
|
2003-10-25 14:01:09 +02:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
/* string options */
|
|
|
|
config_compare(list, "Address", CONFIG_TYPE_STRING, &options->Address) ||
|
|
|
|
config_compare(list, "AllowUnverifiedNodes", CONFIG_TYPE_CSV, &options->AllowUnverifiedNodes) ||
|
|
|
|
config_compare(list, "AuthoritativeDirectory",CONFIG_TYPE_BOOL, &options->AuthoritativeDir) ||
|
2004-01-11 00:40:38 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
config_compare(list, "BandwidthRate", CONFIG_TYPE_UINT, &options->BandwidthRate) ||
|
|
|
|
config_compare(list, "BandwidthBurst", CONFIG_TYPE_UINT, &options->BandwidthBurst) ||
|
2004-06-21 06:37:27 +02:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
config_compare(list, "ClientOnly", CONFIG_TYPE_BOOL, &options->ClientOnly) ||
|
|
|
|
config_compare(list, "ContactInfo", CONFIG_TYPE_STRING, &options->ContactInfo) ||
|
2003-10-25 14:01:09 +02:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
config_compare(list, "DebugLogFile", CONFIG_TYPE_STRING, &options->DebugLogFile) ||
|
|
|
|
config_compare(list, "DataDirectory", CONFIG_TYPE_STRING, &options->DataDirectory) ||
|
|
|
|
config_compare(list, "DirPort", CONFIG_TYPE_UINT, &options->DirPort) ||
|
|
|
|
config_compare(list, "DirBindAddress", CONFIG_TYPE_LINELIST, &options->DirBindAddress) ||
|
|
|
|
config_compare(list, "DirFetchPostPeriod",CONFIG_TYPE_UINT, &options->DirFetchPostPeriod) ||
|
|
|
|
config_compare(list, "DirServer", CONFIG_TYPE_LINELIST, &options->DirServers) ||
|
2003-10-25 14:01:09 +02:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
config_compare(list, "ExitNodes", CONFIG_TYPE_STRING, &options->ExitNodes) ||
|
|
|
|
config_compare(list, "EntryNodes", CONFIG_TYPE_STRING, &options->EntryNodes) ||
|
|
|
|
config_compare(list, "StrictExitNodes", CONFIG_TYPE_BOOL, &options->StrictExitNodes) ||
|
|
|
|
config_compare(list, "StrictEntryNodes", CONFIG_TYPE_BOOL, &options->StrictEntryNodes) ||
|
|
|
|
config_compare(list, "ExitPolicy", CONFIG_TYPE_LINELIST, &options->ExitPolicy) ||
|
|
|
|
config_compare(list, "ExcludeNodes", CONFIG_TYPE_STRING, &options->ExcludeNodes) ||
|
2004-08-15 10:15:12 +02:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
config_compare(list, "FascistFirewall",CONFIG_TYPE_BOOL, &options->FascistFirewall) ||
|
|
|
|
config_compare(list, "FirewallPorts",CONFIG_TYPE_CSV, &options->FirewallPorts) ||
|
2004-10-15 03:58:11 +02:00
|
|
|
config_compare(list, "MyFamily", CONFIG_TYPE_STRING, &options->MyFamily) ||
|
2004-10-15 22:52:09 +02:00
|
|
|
config_compare(list, "NodeFamily", CONFIG_TYPE_LINELIST, &options->NodeFamilies) ||
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
config_compare(list, "Group", CONFIG_TYPE_STRING, &options->Group) ||
|
2004-08-16 13:43:18 +02:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
config_compare(list, "HttpProxy", CONFIG_TYPE_STRING, &options->HttpProxy) ||
|
|
|
|
config_compare(list, "HiddenServiceDir", CONFIG_TYPE_LINELIST, &options->RendConfigLines)||
|
|
|
|
config_compare(list, "HiddenServicePort", CONFIG_TYPE_LINELIST, &options->RendConfigLines)||
|
|
|
|
config_compare(list, "HiddenServiceNodes", CONFIG_TYPE_LINELIST, &options->RendConfigLines)||
|
|
|
|
config_compare(list, "HiddenServiceExcludeNodes", CONFIG_TYPE_LINELIST, &options->RendConfigLines)||
|
2003-10-25 14:01:09 +02:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
config_compare(list, "IgnoreVersion", CONFIG_TYPE_BOOL, &options->IgnoreVersion) ||
|
2003-10-25 14:01:09 +02:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
config_compare(list, "KeepalivePeriod",CONFIG_TYPE_UINT, &options->KeepalivePeriod) ||
|
2003-10-25 14:01:09 +02:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
config_compare(list, "LogLevel", CONFIG_TYPE_LINELIST, &options->LogOptions) ||
|
|
|
|
config_compare(list, "LogFile", CONFIG_TYPE_LINELIST, &options->LogOptions) ||
|
|
|
|
config_compare(list, "LinkPadding", CONFIG_TYPE_OBSOLETE, NULL) ||
|
2003-10-25 14:01:09 +02:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
config_compare(list, "MaxConn", CONFIG_TYPE_UINT, &options->MaxConn) ||
|
|
|
|
config_compare(list, "MaxOnionsPending",CONFIG_TYPE_UINT, &options->MaxOnionsPending) ||
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
config_compare(list, "Nickname", CONFIG_TYPE_STRING, &options->Nickname) ||
|
|
|
|
config_compare(list, "NewCircuitPeriod",CONFIG_TYPE_UINT, &options->NewCircuitPeriod) ||
|
|
|
|
config_compare(list, "NumCpus", CONFIG_TYPE_UINT, &options->NumCpus) ||
|
2003-03-17 03:27:19 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
config_compare(list, "ORPort", CONFIG_TYPE_UINT, &options->ORPort) ||
|
|
|
|
config_compare(list, "ORBindAddress", CONFIG_TYPE_LINELIST, &options->ORBindAddress) ||
|
|
|
|
config_compare(list, "OutboundBindAddress",CONFIG_TYPE_STRING, &options->OutboundBindAddress) ||
|
2003-10-25 14:01:09 +02:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
config_compare(list, "PidFile", CONFIG_TYPE_STRING, &options->PidFile) ||
|
|
|
|
config_compare(list, "PathlenCoinWeight",CONFIG_TYPE_DOUBLE, &options->PathlenCoinWeight) ||
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
config_compare(list, "RouterFile", CONFIG_TYPE_STRING, &options->RouterFile) ||
|
|
|
|
config_compare(list, "RunAsDaemon", CONFIG_TYPE_BOOL, &options->RunAsDaemon) ||
|
|
|
|
config_compare(list, "RunTesting", CONFIG_TYPE_BOOL, &options->RunTesting) ||
|
2004-10-15 07:09:48 +02:00
|
|
|
config_compare(list, "RecommendedVersions",CONFIG_TYPE_LINELIST, &options->RecommendedVersions) ||
|
2004-10-14 04:47:09 +02:00
|
|
|
config_compare(list, "RendNodes", CONFIG_TYPE_STRING, &options->RendNodes) ||
|
|
|
|
config_compare(list, "RendExcludeNodes",CONFIG_TYPE_STRING, &options->RendExcludeNodes) ||
|
2003-10-25 14:01:09 +02:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
config_compare(list, "SocksPort", CONFIG_TYPE_UINT, &options->SocksPort) ||
|
|
|
|
config_compare(list, "SocksBindAddress",CONFIG_TYPE_LINELIST,&options->SocksBindAddress) ||
|
|
|
|
config_compare(list, "SocksPolicy", CONFIG_TYPE_LINELIST,&options->SocksPolicy) ||
|
2003-10-25 14:01:09 +02:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
config_compare(list, "TrafficShaping", CONFIG_TYPE_OBSOLETE, NULL) ||
|
2004-08-16 13:43:18 +02:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
config_compare(list, "User", CONFIG_TYPE_STRING, &options->User)
|
2004-08-16 13:43:18 +02:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
) {
|
2002-11-23 07:49:01 +01:00
|
|
|
/* then we're ok. it matched something. */
|
|
|
|
} else {
|
2004-03-02 06:00:50 +01:00
|
|
|
log_fn(LOG_WARN,"Unknown keyword '%s'. Failing.",list->key);
|
|
|
|
return -1;
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
list = list->next;
|
2003-12-17 22:09:31 +01:00
|
|
|
}
|
2004-10-14 04:47:09 +02: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
|
|
|
/** Set <b>options</b> to a reasonable default.
|
|
|
|
*
|
2004-10-15 21:18:08 +02:00
|
|
|
* Call this function before we parse the torrc file.
|
2004-02-26 22:25:51 +01:00
|
|
|
*/
|
2004-10-14 04:47:09 +02:00
|
|
|
static int
|
|
|
|
config_assign_defaults(or_options_t *options)
|
|
|
|
{
|
2004-02-26 22:25:51 +01:00
|
|
|
/* set them up as a client only */
|
|
|
|
options->SocksPort = 9050;
|
|
|
|
|
2004-08-17 13:42:22 +02:00
|
|
|
options->AllowUnverifiedNodes = smartlist_create();
|
|
|
|
smartlist_add(options->AllowUnverifiedNodes, "middle");
|
|
|
|
smartlist_add(options->AllowUnverifiedNodes, "rendezvous");
|
|
|
|
|
2004-07-05 00:48:11 +02:00
|
|
|
config_free_lines(options->ExitPolicy);
|
2004-10-15 21:18:08 +02:00
|
|
|
options->ExitPolicy = NULL;
|
2004-07-05 00:48:11 +02:00
|
|
|
|
2004-02-26 22:25:51 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
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-03-02 06:19:01 +01:00
|
|
|
"See man page for more options. This -h is probably obsolete.\n\n"
|
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"
|
2004-03-02 06:19:01 +01:00
|
|
|
// "-m <max>\t\tMax number of connections\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");
|
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-05-19 22:07:08 +02:00
|
|
|
config_free_lines(options->LogOptions);
|
2004-06-29 21:46:06 +02:00
|
|
|
tor_free(options->ContactInfo);
|
2003-10-21 11:48:17 +02:00
|
|
|
tor_free(options->DebugLogFile);
|
|
|
|
tor_free(options->DataDirectory);
|
|
|
|
tor_free(options->RouterFile);
|
|
|
|
tor_free(options->Nickname);
|
|
|
|
tor_free(options->Address);
|
|
|
|
tor_free(options->PidFile);
|
2003-11-12 20:34:34 +01:00
|
|
|
tor_free(options->ExitNodes);
|
|
|
|
tor_free(options->EntryNodes);
|
2004-02-28 06:09:37 +01:00
|
|
|
tor_free(options->ExcludeNodes);
|
2004-04-01 22:33:29 +02:00
|
|
|
tor_free(options->RendNodes);
|
|
|
|
tor_free(options->RendExcludeNodes);
|
2004-08-16 13:43:18 +02:00
|
|
|
tor_free(options->OutboundBindAddress);
|
2003-10-22 09:55:44 +02:00
|
|
|
tor_free(options->User);
|
|
|
|
tor_free(options->Group);
|
2004-10-12 22:22:09 +02:00
|
|
|
tor_free(options->HttpProxy);
|
2004-03-31 23:35:23 +02:00
|
|
|
config_free_lines(options->RendConfigLines);
|
2004-05-20 04:42:50 +02:00
|
|
|
config_free_lines(options->SocksBindAddress);
|
|
|
|
config_free_lines(options->ORBindAddress);
|
|
|
|
config_free_lines(options->DirBindAddress);
|
|
|
|
config_free_lines(options->ExitPolicy);
|
|
|
|
config_free_lines(options->SocksPolicy);
|
2004-10-12 17:55:20 +02:00
|
|
|
config_free_lines(options->DirServers);
|
2004-10-15 07:09:48 +02:00
|
|
|
config_free_lines(options->RecommendedVersions);
|
2004-10-15 22:52:09 +02:00
|
|
|
config_free_lines(options->NodeFamilies);
|
2004-08-18 09:06:53 +02:00
|
|
|
if (options->FirewallPorts) {
|
|
|
|
SMARTLIST_FOREACH(options->FirewallPorts, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(options->FirewallPorts);
|
2004-08-18 23:46:53 +02:00
|
|
|
options->FirewallPorts = NULL;
|
2004-08-18 09:06:53 +02:00
|
|
|
}
|
2003-10-21 11:48:17 +02:00
|
|
|
}
|
2002-11-23 07:49:01 +01:00
|
|
|
|
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)
|
|
|
|
{
|
2002-11-23 07:49:01 +01:00
|
|
|
memset(options,0,sizeof(or_options_t));
|
2004-05-19 22:07:08 +02:00
|
|
|
options->LogOptions = NULL;
|
2003-11-12 20:34:34 +01:00
|
|
|
options->ExitNodes = tor_strdup("");
|
|
|
|
options->EntryNodes = tor_strdup("");
|
2004-08-15 22:14:44 +02:00
|
|
|
options->StrictEntryNodes = options->StrictExitNodes = 0;
|
2004-02-28 06:09:37 +01:00
|
|
|
options->ExcludeNodes = tor_strdup("");
|
2004-04-01 22:33:29 +02:00
|
|
|
options->RendNodes = tor_strdup("");
|
|
|
|
options->RendExcludeNodes = tor_strdup("");
|
2004-05-20 04:42:50 +02:00
|
|
|
options->ExitPolicy = NULL;
|
|
|
|
options->SocksPolicy = NULL;
|
|
|
|
options->SocksBindAddress = NULL;
|
|
|
|
options->ORBindAddress = NULL;
|
|
|
|
options->DirBindAddress = NULL;
|
2004-08-16 13:43:18 +02:00
|
|
|
options->OutboundBindAddress = NULL;
|
2004-03-10 08:44:31 +01:00
|
|
|
options->RecommendedVersions = NULL;
|
2003-11-19 23:45:06 +01:00
|
|
|
options->PidFile = NULL; // tor_strdup("tor.pid");
|
2003-09-25 07:17:11 +02:00
|
|
|
options->DataDirectory = NULL;
|
2003-11-14 00:01:56 +01:00
|
|
|
options->PathlenCoinWeight = 0.3;
|
2003-04-17 01:21:44 +02:00
|
|
|
options->MaxConn = 900;
|
2003-10-01 01:06:23 +02:00
|
|
|
options->DirFetchPostPeriod = 600;
|
2002-11-23 07:49:01 +01:00
|
|
|
options->KeepalivePeriod = 300;
|
2003-11-17 08:43:03 +01:00
|
|
|
options->MaxOnionsPending = 100;
|
2004-02-18 04:56:12 +01:00
|
|
|
options->NewCircuitPeriod = 30; /* twice a minute */
|
2004-01-11 00:40:38 +01:00
|
|
|
options->BandwidthRate = 800000; /* at most 800kB/s total sustained incoming */
|
|
|
|
options->BandwidthBurst = 10000000; /* max burst on the token bucket */
|
2003-08-14 05:52:51 +02:00
|
|
|
options->NumCpus = 1;
|
2004-03-31 23:35:23 +02:00
|
|
|
options->RendConfigLines = NULL;
|
2004-08-16 22:47:00 +02:00
|
|
|
options->FirewallPorts = NULL;
|
2004-10-12 17:55:20 +02:00
|
|
|
options->DirServers = NULL;
|
2004-10-15 03:58:11 +02:00
|
|
|
options->MyFamily = NULL;
|
2004-10-15 22:52:09 +02:00
|
|
|
options->NodeFamilies = NULL;
|
2003-10-21 11:48:17 +02:00
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
static char *
|
|
|
|
get_default_conf_file(void)
|
2004-08-18 05:42:55 +02:00
|
|
|
{
|
|
|
|
#ifdef MS_WINDOWS
|
2004-10-14 04:04:43 +02:00
|
|
|
LPITEMIDLIST idl;
|
|
|
|
IMalloc *m;
|
|
|
|
HRESULT result;
|
2004-08-18 05:42:55 +02:00
|
|
|
char *path = tor_malloc(MAX_PATH);
|
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))) {
|
|
|
|
tor_free(path);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
/* 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:42:55 +02:00
|
|
|
tor_free(path);
|
2004-08-18 05:47:55 +02:00
|
|
|
return NULL;
|
2004-08-18 05:42:55 +02:00
|
|
|
}
|
|
|
|
strlcat(path,"\\tor\\torrc",MAX_PATH);
|
|
|
|
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-05-10 06:48:13 +02:00
|
|
|
/** 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. */
|
2004-10-14 04:47:09 +02:00
|
|
|
int
|
|
|
|
getconfig(int argc, char **argv, or_options_t *options)
|
|
|
|
{
|
2004-03-31 23:35:23 +02:00
|
|
|
struct config_line_t *cl;
|
2003-10-21 11:48:17 +02:00
|
|
|
FILE *cf;
|
|
|
|
char *fname;
|
|
|
|
int i;
|
|
|
|
int result = 0;
|
2003-11-13 07:49:25 +01:00
|
|
|
static int first_load = 1;
|
|
|
|
static char **backup_argv;
|
|
|
|
static int backup_argc;
|
|
|
|
char *previous_pidfile = NULL;
|
|
|
|
int previous_runasdaemon = 0;
|
2004-02-29 00:30:41 +01:00
|
|
|
int previous_orport = -1;
|
2004-02-26 22:25:51 +01:00
|
|
|
int using_default_torrc;
|
2003-11-13 07:49:25 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (first_load) { /* first time we're called. save commandline args */
|
2003-11-13 07:49:25 +01:00
|
|
|
backup_argv = argv;
|
|
|
|
backup_argc = argc;
|
|
|
|
first_load = 0;
|
|
|
|
} else { /* we're reloading. need to clean up old ones first. */
|
|
|
|
argv = backup_argv;
|
|
|
|
argc = backup_argc;
|
|
|
|
|
|
|
|
/* record some previous values, so we can fail if they change */
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->PidFile)
|
2003-12-03 23:00:20 +01:00
|
|
|
previous_pidfile = tor_strdup(options->PidFile);
|
2003-11-13 07:49:25 +01:00
|
|
|
previous_runasdaemon = options->RunAsDaemon;
|
2004-02-29 00:30:41 +01:00
|
|
|
previous_orport = options->ORPort;
|
2003-11-13 07:49:25 +01:00
|
|
|
free_options(options);
|
|
|
|
}
|
2003-12-17 22:09:31 +01:00
|
|
|
init_options(options);
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (argc > 1 && (!strcmp(argv[1], "-h") || !strcmp(argv[1],"--help"))) {
|
2003-10-20 03:19:54 +02:00
|
|
|
print_usage();
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (argc > 1 && (!strcmp(argv[1],"--version"))) {
|
2004-03-02 06:19:01 +01:00
|
|
|
printf("Tor version %s.\n",VERSION);
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
2002-11-23 07:49:01 +01:00
|
|
|
/* learn config file name, get config lines, assign them */
|
|
|
|
i = 1;
|
2004-10-14 04:47:09 +02:00
|
|
|
while (i < argc-1 && strcmp(argv[i],"-f")) {
|
2002-11-23 07:49:01 +01:00
|
|
|
i++;
|
|
|
|
}
|
2004-10-14 04:47:09 +02:00
|
|
|
|
|
|
|
if (i < argc-1) { /* we found one */
|
2004-07-16 21:43:58 +02:00
|
|
|
fname = tor_strdup(argv[i+1]);
|
2004-02-26 22:25:51 +01:00
|
|
|
using_default_torrc = 0;
|
2004-07-16 21:43:58 +02:00
|
|
|
} else {
|
2004-08-18 05:42:55 +02:00
|
|
|
/* didn't find one, try CONFDIR */
|
2004-08-18 05:47:55 +02:00
|
|
|
char *fn;
|
|
|
|
using_default_torrc = 1;
|
|
|
|
fn = get_default_conf_file();
|
2004-10-14 04:47:09 +02:00
|
|
|
if (fn && file_status(fn) == FN_FILE) {
|
2004-08-18 05:47:55 +02:00
|
|
|
fname = fn;
|
|
|
|
} else {
|
|
|
|
tor_free(fn);
|
|
|
|
fn = expand_filename("~/.torrc");
|
2004-10-14 04:47:09 +02:00
|
|
|
if (fn && file_status(fn) == FN_FILE) {
|
2004-08-18 05:47:55 +02:00
|
|
|
fname = fn;
|
|
|
|
} else {
|
|
|
|
tor_free(fn);
|
|
|
|
fname = get_default_conf_file();
|
|
|
|
}
|
|
|
|
}
|
cleanups, bugfixes, more verbose logs
Fixed up the assert_*_ok funcs some (more work remains)
Changed config so it reads either /etc/torrc or the -f arg, never both
Finally tracked down a nasty bug with our use of tls:
It turns out that if you ask SSL_read() for no more than n bytes, it
will read the entire record from the network (and maybe part of the next
record, I'm not sure), give you n bytes of it, and keep the remaining
bytes internally. This is fine, except our poll-for-read looks at the
network, and there are no bytes pending on the network, so we never know
to ask SSL_read() for more bytes. Currently I've hacked it so if we ask
for n bytes and it returns n bytes, then it reads again right then. This
will interact poorly with our rate limiting; we need a cleaner solution.
svn:r481
2003-09-24 23:24:52 +02:00
|
|
|
}
|
2004-08-24 22:48:22 +02:00
|
|
|
tor_assert(fname);
|
2004-10-14 04:47:09 +02:00
|
|
|
log(LOG_DEBUG, "Opening config file '%s'", fname);
|
cleanups, bugfixes, more verbose logs
Fixed up the assert_*_ok funcs some (more work remains)
Changed config so it reads either /etc/torrc or the -f arg, never both
Finally tracked down a nasty bug with our use of tls:
It turns out that if you ask SSL_read() for no more than n bytes, it
will read the entire record from the network (and maybe part of the next
record, I'm not sure), give you n bytes of it, and keep the remaining
bytes internally. This is fine, except our poll-for-read looks at the
network, and there are no bytes pending on the network, so we never know
to ask SSL_read() for more bytes. Currently I've hacked it so if we ask
for n bytes and it returns n bytes, then it reads again right then. This
will interact poorly with our rate limiting; we need a cleaner solution.
svn:r481
2003-09-24 23:24:52 +02:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (config_assign_defaults(options) < 0) {
|
2004-09-03 00:08:36 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-08-24 22:48:22 +02:00
|
|
|
cf = fopen(fname, "r");
|
2004-10-14 04:47:09 +02:00
|
|
|
if (!cf) {
|
|
|
|
if (using_default_torrc == 1) {
|
|
|
|
log(LOG_NOTICE, "Configuration file '%s' not present, "
|
|
|
|
"using reasonable defaults.", fname);
|
2004-07-16 21:43:58 +02:00
|
|
|
tor_free(fname);
|
2004-02-26 22:25:51 +01:00
|
|
|
} else {
|
2004-10-14 04:47:09 +02:00
|
|
|
log(LOG_WARN, "Unable to open configuration file '%s'.", fname);
|
2004-07-16 21:43:58 +02:00
|
|
|
tor_free(fname);
|
2004-02-26 22:25:51 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
} else { /* it opened successfully. use it. */
|
2004-07-16 21:43:58 +02:00
|
|
|
tor_free(fname);
|
2004-09-03 00:08:36 +02:00
|
|
|
if (config_get_lines(cf, &cl)<0)
|
|
|
|
return -1;
|
2004-10-14 04:47:09 +02:00
|
|
|
if (config_assign(options,cl) < 0)
|
2004-03-02 06:00:50 +01:00
|
|
|
return -1;
|
2004-02-26 22:25:51 +01:00
|
|
|
config_free_lines(cl);
|
2004-08-24 22:48:22 +02:00
|
|
|
fclose(cf);
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
cleanups, bugfixes, more verbose logs
Fixed up the assert_*_ok funcs some (more work remains)
Changed config so it reads either /etc/torrc or the -f arg, never both
Finally tracked down a nasty bug with our use of tls:
It turns out that if you ask SSL_read() for no more than n bytes, it
will read the entire record from the network (and maybe part of the next
record, I'm not sure), give you n bytes of it, and keep the remaining
bytes internally. This is fine, except our poll-for-read looks at the
network, and there are no bytes pending on the network, so we never know
to ask SSL_read() for more bytes. Currently I've hacked it so if we ask
for n bytes and it returns n bytes, then it reads again right then. This
will interact poorly with our rate limiting; we need a cleaner solution.
svn:r481
2003-09-24 23:24:52 +02:00
|
|
|
|
2002-11-23 07:49:01 +01:00
|
|
|
/* go through command-line variables too */
|
|
|
|
cl = config_get_commandlines(argc,argv);
|
2004-10-14 04:47:09 +02:00
|
|
|
if (config_assign(options,cl) < 0)
|
2004-03-02 06:00:50 +01:00
|
|
|
return -1;
|
2002-11-23 07:49:01 +01:00
|
|
|
config_free_lines(cl);
|
|
|
|
|
|
|
|
/* Validate options */
|
|
|
|
|
2003-11-14 00:01:56 +01:00
|
|
|
/* first check if any of the previous options have changed but aren't allowed to */
|
2004-10-14 04:47:09 +02:00
|
|
|
if (previous_pidfile && strcmp(previous_pidfile,options->PidFile)) {
|
2003-11-13 07:49:25 +01:00
|
|
|
log_fn(LOG_WARN,"During reload, PidFile changed from %s to %s. Failing.",
|
|
|
|
previous_pidfile, options->PidFile);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
tor_free(previous_pidfile);
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (previous_runasdaemon && !options->RunAsDaemon) {
|
2003-11-13 07:49:25 +01:00
|
|
|
log_fn(LOG_WARN,"During reload, change from RunAsDaemon=1 to =0 not allowed. Failing.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (previous_orport == 0 && options->ORPort > 0) {
|
2004-02-29 00:31:15 +01:00
|
|
|
log_fn(LOG_WARN,"During reload, change from ORPort=0 to >0 not allowed. Failing.");
|
2004-02-29 00:30:41 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
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-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-10-14 04:47:09 +02:00
|
|
|
if (options->StrictExitNodes && !strlen(options->ExitNodes)) {
|
|
|
|
log(LOG_WARN, "StrictExitNodes set, but no ExitNodes listed.");
|
2004-08-15 22:14:44 +02:00
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->StrictEntryNodes && !strlen(options->EntryNodes)) {
|
|
|
|
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->FascistFirewall && !options->FirewallPorts) {
|
2004-08-16 22:47:00 +02:00
|
|
|
options->FirewallPorts = smartlist_create();
|
2004-08-18 23:46:53 +02:00
|
|
|
smartlist_add(options->FirewallPorts, tor_strdup("80"));
|
|
|
|
smartlist_add(options->FirewallPorts, tor_strdup("443"));
|
2004-08-16 22:47:00 +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-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;
|
|
|
|
}
|
|
|
|
options->HttpProxyAddr = ntohl(options->HttpProxyAddr); /* switch to host-order */
|
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"))
|
|
|
|
return -1;
|
|
|
|
if (check_nickname_list(options->EntryNodes, "EntryNodes"))
|
|
|
|
return -1;
|
|
|
|
if (check_nickname_list(options->ExcludeNodes, "ExcludeNodes"))
|
|
|
|
return -1;
|
|
|
|
if (check_nickname_list(options->RendNodes, "RendNodes"))
|
|
|
|
return -1;
|
|
|
|
if (check_nickname_list(options->RendNodes, "RendExcludeNodes"))
|
|
|
|
return -1;
|
|
|
|
if (check_nickname_list(options->MyFamily, "MyFamily"))
|
|
|
|
return -1;
|
2004-10-15 22:52:09 +02:00
|
|
|
for (cl = options->NodeFamilies; cl; cl = cl->next) {
|
|
|
|
if (check_nickname_list(cl->value, "NodeFamily"))
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
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)
|
|
|
|
return -1;
|
|
|
|
}
|
2004-10-12 17:55:20 +02:00
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
if (file_opt) {
|
|
|
|
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);
|
|
|
|
} 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")) {
|
|
|
|
if (opt->next && !strcasecmp(opt->next->key, "LogFile")) {
|
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")) {
|
|
|
|
log_fn(LOG_WARN, "Two LogLevel options in a row without intervening LogFile");
|
|
|
|
opt = opt->next;
|
|
|
|
} else {
|
2004-05-19 23:40:44 +02:00
|
|
|
tor_assert(!strcasecmp(opt->key, "LogFile"));
|
2004-05-19 22:07:08 +02:00
|
|
|
if (opt->next && !strcasecmp(opt->next->key, "LogLevel")) {
|
|
|
|
/* LogFile 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 {
|
|
|
|
/* LogFile followed by LogFile 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-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-08-18 05:42:55 +02:00
|
|
|
if (!SUCCEEDED(SHGetSpecialFolderPath(NULL, p, CSIDL_APPDATA, 1))) {
|
|
|
|
strlcpy(p,CONFDIR, MAX_PATH);
|
2004-08-18 05:47:55 +02:00
|
|
|
}
|
2004-08-18 05:42:55 +02:00
|
|
|
strlcat(p,"\\tor",MAX_PATH);
|
|
|
|
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:
|
|
|
|
*/
|