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"
|
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 {
|
|
|
|
CONFIG_TYPE_STRING = 0, /**< An arbitrary string. */
|
|
|
|
CONFIG_TYPE_INT, /**< An integer */
|
|
|
|
CONFIG_TYPE_DOUBLE, /**< A floating-point value */
|
|
|
|
CONFIG_TYPE_BOOL, /**< A boolean value, expressed as 0 or 1. */
|
2004-08-16 22:47:00 +02:00
|
|
|
CONFIG_TYPE_CSV, /**< A list of strings, separated by commas and optional
|
|
|
|
* whitespace. */
|
2004-05-10 06:48:13 +02:00
|
|
|
CONFIG_TYPE_LINELIST, /**< Uninterpreted config lines */
|
|
|
|
} 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
|
|
|
|
|
|
|
static FILE *config_open(const unsigned char *filename);
|
|
|
|
static int config_close(FILE *f);
|
2004-03-31 23:35:23 +02:00
|
|
|
static struct config_line_t *config_get_commandlines(int argc, char **argv);
|
|
|
|
static struct config_line_t *config_get_lines(FILE *f);
|
|
|
|
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);
|
2003-09-08 07:16:18 +02:00
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/** Open a configuration file for reading */
|
2003-09-08 07:16:18 +02:00
|
|
|
static FILE *config_open(const unsigned char *filename) {
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(filename);
|
2002-11-23 07:49:01 +01:00
|
|
|
if (strspn(filename,CONFIG_LEGAL_FILENAME_CHARACTERS) != strlen(filename)) {
|
|
|
|
/* filename has illegal letters */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return fopen(filename, "r");
|
|
|
|
}
|
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/** Close the configuration file */
|
2003-09-08 07:16:18 +02:00
|
|
|
static int config_close(FILE *f) {
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(f);
|
2002-11-23 07:49:01 +01:00
|
|
|
return fclose(f);
|
|
|
|
}
|
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/** Helper: Read a list of configuration options from the command line. */
|
2004-03-31 23:35:23 +02:00
|
|
|
static struct config_line_t *config_get_commandlines(int argc, char **argv) {
|
|
|
|
struct config_line_t *new;
|
|
|
|
struct config_line_t *front = NULL;
|
2002-11-23 07:49:01 +01:00
|
|
|
char *s;
|
|
|
|
int i = 1;
|
|
|
|
|
2003-12-17 22:09:31 +01:00
|
|
|
while(i < argc-1) {
|
2002-11-23 07:49:01 +01:00
|
|
|
if(!strcmp(argv[i],"-f")) {
|
|
|
|
// log(LOG_DEBUG,"Commandline: skipping over -f.");
|
|
|
|
i+=2; /* this is the config file option. ignore it. */
|
|
|
|
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];
|
|
|
|
while(*s == '-')
|
|
|
|
s++;
|
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'",
|
|
|
|
new->key, new->value);
|
|
|
|
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;
|
|
|
|
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-05-10 06:48:13 +02:00
|
|
|
* strings. Return list, or NULL if parsing the file failed. Warn and
|
|
|
|
* ignore any misformatted lines. */
|
2004-03-31 23:35:23 +02:00
|
|
|
static struct config_line_t *config_get_lines(FILE *f) {
|
|
|
|
|
|
|
|
struct config_line_t *front = NULL;
|
|
|
|
char line[CONFIG_LINE_T_MAXLEN];
|
2003-09-29 09:50:08 +02:00
|
|
|
int result;
|
|
|
|
char *key, *value;
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2003-09-29 09:50:08 +02:00
|
|
|
while( (result=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
|
|
|
}
|
2003-09-29 09:50:08 +02:00
|
|
|
if(result < 0)
|
|
|
|
return NULL;
|
2002-11-23 07:49:01 +01:00
|
|
|
return front;
|
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-03-31 23:35:23 +02:00
|
|
|
static void config_free_lines(struct config_line_t *front) {
|
|
|
|
struct config_line_t *tmp;
|
2002-11-23 07:49:01 +01:00
|
|
|
|
|
|
|
while(front) {
|
|
|
|
tmp = front;
|
|
|
|
front = tmp->next;
|
|
|
|
|
|
|
|
free(tmp->key);
|
|
|
|
free(tmp->value);
|
|
|
|
free(tmp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-08-16 22:47:00 +02:00
|
|
|
/**
|
|
|
|
* Given a list of comma-separated entries, each surrounded by optional
|
|
|
|
* whitespace, insert copies the entries (in order) into lst, without
|
|
|
|
* their surrounding whitespace.
|
|
|
|
*/
|
|
|
|
static void parse_csv_into_smartlist(smartlist_t *lst, const char *val)
|
|
|
|
{
|
|
|
|
const char *cp, *start, *end;
|
|
|
|
|
|
|
|
cp = val;
|
|
|
|
while (1) {
|
|
|
|
while (isspace(*cp))
|
|
|
|
++cp;
|
|
|
|
start = cp;
|
|
|
|
end = strchr(cp, ',');
|
|
|
|
if (!end)
|
|
|
|
end = strchr(cp, '\0');
|
|
|
|
for (cp=end-1; cp>=start && isspace(*cp); --cp)
|
|
|
|
;
|
|
|
|
/* Now start points to the first nonspace character of an entry,
|
|
|
|
* end points to the terminator of that entry,
|
|
|
|
* and cp points to the last nonspace character of an entry. */
|
|
|
|
tor_assert(start <= cp);
|
|
|
|
tor_assert(cp <= end);
|
|
|
|
tor_assert(*end == '\0' || *end == ',');
|
|
|
|
tor_assert((!isspace(*start) && !isspace(*cp)) || start==cp);
|
|
|
|
smartlist_add(lst, tor_strndup(start, cp-start));
|
|
|
|
if (!*end)
|
|
|
|
break;
|
|
|
|
cp = end+1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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-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) {
|
2003-03-17 03:27:19 +01:00
|
|
|
int i;
|
2002-11-23 07:49:01 +01:00
|
|
|
|
|
|
|
if(strncasecmp(c->key,key,strlen(c->key)))
|
|
|
|
return 0;
|
|
|
|
|
2004-05-19 22:07:08 +02:00
|
|
|
if(strcasecmp(c->key,key)) {
|
|
|
|
tor_free(c->key);
|
|
|
|
c->key = tor_strdup(key);
|
|
|
|
}
|
|
|
|
|
2002-11-23 07:49:01 +01:00
|
|
|
/* it's a match. cast and assign. */
|
2003-06-18 00:18:26 +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) {
|
2003-12-17 22:09:31 +01:00
|
|
|
case CONFIG_TYPE_INT:
|
2002-11-23 07:49:01 +01:00
|
|
|
*(int *)arg = atoi(c->value);
|
2002-07-03 21:58:18 +02:00
|
|
|
break;
|
2003-03-17 03:27:19 +01:00
|
|
|
case CONFIG_TYPE_BOOL:
|
|
|
|
i = atoi(c->value);
|
|
|
|
if (i != 0 && i != 1) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log(LOG_WARN, "Boolean keyword '%s' expects 0 or 1", c->key);
|
2003-03-18 02:49:55 +01:00
|
|
|
return 0;
|
2003-03-17 03:27:19 +01:00
|
|
|
}
|
|
|
|
*(int *)arg = i;
|
|
|
|
break;
|
2002-11-23 07:49:01 +01:00
|
|
|
case CONFIG_TYPE_STRING:
|
2003-10-21 11:48:17 +02:00
|
|
|
tor_free(*(char **)arg);
|
2003-10-04 05:29:09 +02:00
|
|
|
*(char **)arg = tor_strdup(c->value);
|
2002-07-03 21:58:18 +02:00
|
|
|
break;
|
2002-11-23 07:49:01 +01:00
|
|
|
case CONFIG_TYPE_DOUBLE:
|
|
|
|
*(double *)arg = atof(c->value);
|
2002-07-03 21:58:18 +02:00
|
|
|
break;
|
2004-08-16 22:47:00 +02:00
|
|
|
case CONFIG_TYPE_CSV:
|
|
|
|
if (arg) {
|
|
|
|
SMARTLIST_FOREACH((smartlist_t*)arg, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free((smartlist_t*)arg);
|
|
|
|
}
|
|
|
|
arg = smartlist_create();
|
|
|
|
parse_csv_into_smartlist(arg, c->value);
|
|
|
|
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;
|
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-03-31 23:35:23 +02:00
|
|
|
static int config_assign(or_options_t *options, struct config_line_t *list) {
|
2002-11-23 07:49:01 +01:00
|
|
|
|
|
|
|
while(list) {
|
|
|
|
if(
|
|
|
|
|
|
|
|
/* order matters here! abbreviated arguments use the first match. */
|
|
|
|
|
|
|
|
/* string options */
|
2003-10-25 14:01:09 +02:00
|
|
|
config_compare(list, "Address", CONFIG_TYPE_STRING, &options->Address) ||
|
2004-06-21 06:37:27 +02:00
|
|
|
config_compare(list, "AuthoritativeDirectory",CONFIG_TYPE_BOOL, &options->AuthoritativeDir) ||
|
2003-10-25 14:01:09 +02:00
|
|
|
|
2004-01-11 00:40:38 +01:00
|
|
|
config_compare(list, "BandwidthRate", CONFIG_TYPE_INT, &options->BandwidthRate) ||
|
|
|
|
config_compare(list, "BandwidthBurst", CONFIG_TYPE_INT, &options->BandwidthBurst) ||
|
|
|
|
|
2004-07-13 09:42:20 +02:00
|
|
|
config_compare(list, "ClientOnly", CONFIG_TYPE_BOOL, &options->ClientOnly) ||
|
2004-06-29 21:46:06 +02:00
|
|
|
config_compare(list, "ContactInfo", CONFIG_TYPE_STRING, &options->ContactInfo) ||
|
2004-06-21 06:37:27 +02:00
|
|
|
|
2003-10-15 20:50:16 +02:00
|
|
|
config_compare(list, "DebugLogFile", CONFIG_TYPE_STRING, &options->DebugLogFile) ||
|
2003-09-25 07:17:11 +02:00
|
|
|
config_compare(list, "DataDirectory", CONFIG_TYPE_STRING, &options->DataDirectory) ||
|
2003-10-25 14:01:09 +02:00
|
|
|
config_compare(list, "DirPort", CONFIG_TYPE_INT, &options->DirPort) ||
|
2004-05-20 04:42:50 +02:00
|
|
|
config_compare(list, "DirBindAddress", CONFIG_TYPE_LINELIST, &options->DirBindAddress) ||
|
2003-10-25 14:01:09 +02:00
|
|
|
config_compare(list, "DirFetchPostPeriod",CONFIG_TYPE_INT, &options->DirFetchPostPeriod) ||
|
|
|
|
|
2003-11-12 20:34:34 +01:00
|
|
|
config_compare(list, "ExitNodes", CONFIG_TYPE_STRING, &options->ExitNodes) ||
|
|
|
|
config_compare(list, "EntryNodes", CONFIG_TYPE_STRING, &options->EntryNodes) ||
|
2004-08-15 22:14:44 +02:00
|
|
|
config_compare(list, "StrictExitNodes", CONFIG_TYPE_BOOL, &options->StrictExitNodes) ||
|
|
|
|
config_compare(list, "StrictEntryNodes", CONFIG_TYPE_BOOL, &options->StrictEntryNodes) ||
|
2004-05-22 20:05:20 +02:00
|
|
|
config_compare(list, "ExitPolicy", CONFIG_TYPE_LINELIST, &options->ExitPolicy) ||
|
2004-02-28 06:09:37 +01:00
|
|
|
config_compare(list, "ExcludeNodes", CONFIG_TYPE_STRING, &options->ExcludeNodes) ||
|
2003-10-25 14:01:09 +02:00
|
|
|
|
2004-08-15 10:15:12 +02:00
|
|
|
config_compare(list, "FascistFirewall",CONFIG_TYPE_BOOL, &options->FascistFirewall) ||
|
2004-08-16 22:47:00 +02:00
|
|
|
config_compare(list, "FirewallPorts",CONFIG_TYPE_CSV, &options->FirewallPorts) ||
|
2004-08-15 10:15:12 +02:00
|
|
|
|
2003-10-22 09:55:44 +02:00
|
|
|
config_compare(list, "Group", CONFIG_TYPE_STRING, &options->Group) ||
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2004-08-16 13:43:18 +02:00
|
|
|
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
|
|
|
config_compare(list, "IgnoreVersion", CONFIG_TYPE_BOOL, &options->IgnoreVersion) ||
|
|
|
|
|
|
|
|
config_compare(list, "KeepalivePeriod",CONFIG_TYPE_INT, &options->KeepalivePeriod) ||
|
|
|
|
|
2004-05-19 22:07:08 +02:00
|
|
|
config_compare(list, "LogLevel", CONFIG_TYPE_LINELIST, &options->LogOptions) ||
|
|
|
|
config_compare(list, "LogFile", CONFIG_TYPE_LINELIST, &options->LogOptions) ||
|
2003-10-25 14:01:09 +02:00
|
|
|
config_compare(list, "LinkPadding", CONFIG_TYPE_BOOL, &options->LinkPadding) ||
|
|
|
|
|
|
|
|
config_compare(list, "MaxConn", CONFIG_TYPE_INT, &options->MaxConn) ||
|
2002-11-27 05:08:20 +01:00
|
|
|
config_compare(list, "MaxOnionsPending",CONFIG_TYPE_INT, &options->MaxOnionsPending) ||
|
2003-10-25 14:01:09 +02:00
|
|
|
|
|
|
|
config_compare(list, "Nickname", CONFIG_TYPE_STRING, &options->Nickname) ||
|
2003-04-16 08:18:31 +02:00
|
|
|
config_compare(list, "NewCircuitPeriod",CONFIG_TYPE_INT, &options->NewCircuitPeriod) ||
|
2003-10-25 14:01:09 +02:00
|
|
|
config_compare(list, "NumCpus", CONFIG_TYPE_INT, &options->NumCpus) ||
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2003-10-25 14:01:09 +02:00
|
|
|
config_compare(list, "ORPort", CONFIG_TYPE_INT, &options->ORPort) ||
|
2004-05-20 04:42:50 +02:00
|
|
|
config_compare(list, "ORBindAddress", CONFIG_TYPE_LINELIST, &options->ORBindAddress) ||
|
2004-08-16 13:43:18 +02:00
|
|
|
config_compare(list, "OutboundBindAddress",CONFIG_TYPE_STRING, &options->OutboundBindAddress) ||
|
2003-03-17 03:27:19 +01:00
|
|
|
|
2003-10-25 14:01:09 +02:00
|
|
|
config_compare(list, "PidFile", CONFIG_TYPE_STRING, &options->PidFile) ||
|
2003-11-14 00:01:56 +01:00
|
|
|
config_compare(list, "PathlenCoinWeight",CONFIG_TYPE_DOUBLE, &options->PathlenCoinWeight) ||
|
2003-10-25 14:01:09 +02:00
|
|
|
|
|
|
|
config_compare(list, "RouterFile", CONFIG_TYPE_STRING, &options->RouterFile) ||
|
|
|
|
config_compare(list, "RunAsDaemon", CONFIG_TYPE_BOOL, &options->RunAsDaemon) ||
|
2004-08-16 13:43:18 +02:00
|
|
|
config_compare(list, "RunTesting", CONFIG_TYPE_BOOL, &options->RunTesting) ||
|
2003-11-14 00:01:56 +01:00
|
|
|
config_compare(list, "RecommendedVersions",CONFIG_TYPE_STRING, &options->RecommendedVersions) ||
|
2004-04-01 22:33:29 +02:00
|
|
|
config_compare(list, "RendNodes", CONFIG_TYPE_STRING, &options->RendNodes) ||
|
|
|
|
config_compare(list, "RendExcludeNodes",CONFIG_TYPE_STRING, &options->RendExcludeNodes) ||
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2003-10-25 14:01:09 +02:00
|
|
|
config_compare(list, "SocksPort", CONFIG_TYPE_INT, &options->SocksPort) ||
|
2004-05-20 04:42:50 +02:00
|
|
|
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
|
|
|
|
|
|
|
config_compare(list, "TrafficShaping", CONFIG_TYPE_BOOL, &options->TrafficShaping) ||
|
|
|
|
|
2004-08-16 13:43:18 +02:00
|
|
|
config_compare(list, "User", CONFIG_TYPE_STRING, &options->User)
|
|
|
|
|
|
|
|
|
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-03-02 06:00:50 +01:00
|
|
|
return 0;
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
|
|
|
|
2004-02-26 22:25:51 +01:00
|
|
|
const char default_dirservers_string[] =
|
2004-04-29 10:10:13 +02:00
|
|
|
"router moria1 18.244.0.188 9001 9021 9031\n"
|
|
|
|
"platform Tor 0.0.6rc1 on Linux moria.mit.edu i686\n"
|
|
|
|
"published 2004-04-25 21:54:28\n"
|
|
|
|
"bandwidth 800000 10000000\n"
|
2004-02-26 22:25:51 +01:00
|
|
|
"onion-key\n"
|
|
|
|
"-----BEGIN RSA PUBLIC KEY-----\n"
|
|
|
|
"MIGJAoGBANoIvHieyHUTzIacbnWOnyTyzGrLOdXqbcjz2GGMxyHEd5K1bO1ZBNHP\n"
|
|
|
|
"9i5qLQpN5viFk2K2rEGuG8tFgDEzSWZEtBqv3NVfUdiumdERWMBwlaQ0MVK4C+jf\n"
|
|
|
|
"y5gZ8KI3o9ZictgPS1AQF+Kk932/vIHTuRIUKb4ILTnQilNvID0NAgMBAAE=\n"
|
|
|
|
"-----END RSA PUBLIC KEY-----\n"
|
|
|
|
"signing-key\n"
|
|
|
|
"-----BEGIN RSA PUBLIC KEY-----\n"
|
|
|
|
"MIGJAoGBAMHa0ZC/jo2Q2DrwKYF/6ZbmZ27PFYG91u4gUzzmZ/VXLpZ8wNzEV3oW\n"
|
|
|
|
"nt+I61048fBiC1frT1/DZ351n2bLSk9zJbB6jyGZJn0380FPRX3+cXyXS0Gq8Ril\n"
|
|
|
|
"xkhMQf5XuNFUb8UmYPSOH4WErjvYjKvU+gfjbK/82Jo9SuHpYz+BAgMBAAE=\n"
|
|
|
|
"-----END RSA PUBLIC KEY-----\n"
|
2004-04-29 10:10:13 +02:00
|
|
|
"reject 0.0.0.0/255.0.0.0:*\n"
|
|
|
|
"reject 169.254.0.0/255.255.0.0:*\n"
|
|
|
|
"reject 127.0.0.0/255.0.0.0:*\n"
|
|
|
|
"reject 192.168.0.0/255.255.0.0:*\n"
|
|
|
|
"reject 10.0.0.0/255.0.0.0:*\n"
|
|
|
|
"reject 172.16.0.0/255.240.0.0:*\n"
|
|
|
|
"accept *:20-22\n"
|
|
|
|
"accept *:53\n"
|
|
|
|
"accept *:79-80\n"
|
|
|
|
"accept *:110\n"
|
|
|
|
"accept *:143\n"
|
|
|
|
"accept *:443\n"
|
|
|
|
"accept *:873\n"
|
|
|
|
"accept *:993\n"
|
|
|
|
"accept *:995\n"
|
|
|
|
"accept *:1024-65535\n"
|
|
|
|
"reject *:*\n"
|
2004-02-26 22:25:51 +01:00
|
|
|
"router-signature\n"
|
|
|
|
"-----BEGIN SIGNATURE-----\n"
|
2004-04-29 10:10:13 +02:00
|
|
|
"o1eAoRHDAEAXsnh5wN++vIwrupd+DbAJ2p3wxHDrmqxTpygzxxCnyQyhMfX03ua2\n"
|
|
|
|
"4iplyNlwyFwzWcw0sk31otlO2HBYXT1V9G0YxGtKMOeOBMHjfGbUjGvEALHzWi4z\n"
|
|
|
|
"8DXGJp13zgnUyP4ZA6xaGROwcT6oB5e7UlztvvpGxTg=\n"
|
2004-02-26 22:25:51 +01:00
|
|
|
"-----END SIGNATURE-----\n"
|
|
|
|
"\n"
|
2004-04-29 10:10:13 +02:00
|
|
|
"router moria2 18.244.0.188 9002 9022 9032\n"
|
|
|
|
"platform Tor 0.0.6rc1 on Linux moria.mit.edu i686\n"
|
|
|
|
"published 2004-04-25 21:54:30\n"
|
|
|
|
"bandwidth 800000 10000000\n"
|
2004-02-26 22:25:51 +01:00
|
|
|
"onion-key\n"
|
|
|
|
"-----BEGIN RSA PUBLIC KEY-----\n"
|
|
|
|
"MIGJAoGBAM4Cc/npgYC54XrYLC+grVxJp7PDmNO2DRRJOxKttBBtvLpnR1UaueTi\n"
|
|
|
|
"kyknT5kmlx+ihgZF/jmye//2dDUp2+kK/kSkpRV4xnDLXZmed+sNSQxqmm9TtZQ9\n"
|
|
|
|
"/hjpxhp5J9HmUTYhntBs+4E4CUKokmrI6oRLoln4SA39AX9QLPcnAgMBAAE=\n"
|
|
|
|
"-----END RSA PUBLIC KEY-----\n"
|
|
|
|
"signing-key\n"
|
|
|
|
"-----BEGIN RSA PUBLIC KEY-----\n"
|
|
|
|
"MIGJAoGBAOcrht/y5rkaahfX7sMe2qnpqoPibsjTSJaDvsUtaNP/Bq0MgNDGOR48\n"
|
|
|
|
"rtwfqTRff275Edkp/UYw3G3vSgKCJr76/bqOHCmkiZrnPV1zxNfrK18gNw2Cxre0\n"
|
|
|
|
"nTA+fD8JQqpPtb8b0SnG9kwy75eS//sRu7TErie2PzGMxrf9LH0LAgMBAAE=\n"
|
|
|
|
"-----END RSA PUBLIC KEY-----\n"
|
2004-04-29 10:10:13 +02:00
|
|
|
"reject 0.0.0.0/255.0.0.0:*\n"
|
|
|
|
"reject 169.254.0.0/255.255.0.0:*\n"
|
|
|
|
"reject 127.0.0.0/255.0.0.0:*\n"
|
|
|
|
"reject 192.168.0.0/255.255.0.0:*\n"
|
|
|
|
"reject 10.0.0.0/255.0.0.0:*\n"
|
|
|
|
"reject 172.16.0.0/255.240.0.0:*\n"
|
|
|
|
"accept *:20-22\n"
|
|
|
|
"accept *:53\n"
|
|
|
|
"accept *:79-80\n"
|
|
|
|
"accept *:110\n"
|
|
|
|
"accept *:143\n"
|
|
|
|
"accept *:443\n"
|
|
|
|
"accept *:873\n"
|
|
|
|
"accept *:993\n"
|
|
|
|
"accept *:995\n"
|
|
|
|
"accept *:1024-65535\n"
|
|
|
|
"reject *:*\n"
|
2004-02-26 22:25:51 +01:00
|
|
|
"router-signature\n"
|
|
|
|
"-----BEGIN SIGNATURE-----\n"
|
2004-04-29 10:10:13 +02:00
|
|
|
"RKROLwP1ExjTZeg6wuN0pzYqed9IJUd5lAe9hp4ritbnmJAgS6qfww6jgx61CfUR\n"
|
|
|
|
"6SElhOLE7Q77jAdoL45Ji5pn/Y+Q+E+5lJm1E/ed9ha+YsOPaOc7z6GQ7E4mihCL\n"
|
|
|
|
"gI1vsw92+P1Ty4RHj6fyD9DhbV19nh2Qs+pvGJOS2FY=\n"
|
2004-02-26 22:25:51 +01:00
|
|
|
"-----END SIGNATURE-----\n"
|
|
|
|
"\n"
|
2004-05-07 00:47:15 +02:00
|
|
|
"router tor26 62.116.124.106 9001 9050 9030\n"
|
|
|
|
"platform Tor 0.0.6 on Linux seppia i686\n"
|
|
|
|
"published 2004-05-06 21:33:23\n"
|
|
|
|
"bandwidth 500000 10000000\n"
|
2004-02-26 22:25:51 +01:00
|
|
|
"onion-key\n"
|
|
|
|
"-----BEGIN RSA PUBLIC KEY-----\n"
|
2004-05-07 00:47:15 +02:00
|
|
|
"MIGJAoGBAMEHdDnpj3ik1AF1xe/VqjoguH2DbANifYqXXfempu0fS+tU9FGo6dU/\n"
|
|
|
|
"fnVHAZwL9Ek9k2rMzumShi1RduK9p035R/Gk+PBBcLfvwYJ/Nat+ZO/L8jn/3bZe\n"
|
|
|
|
"ieQd9CKj2LjNGKpRNry37vkwMGIOIlegwK+2us8aXJ7sIvlNts0TAgMBAAE=\n"
|
2004-02-26 22:25:51 +01:00
|
|
|
"-----END RSA PUBLIC KEY-----\n"
|
|
|
|
"signing-key\n"
|
|
|
|
"-----BEGIN RSA PUBLIC KEY-----\n"
|
2004-05-07 00:47:15 +02:00
|
|
|
"MIGJAoGBAMQgV2gXLbXgesWgeAsj8P1Uvm/zibrFXqwDq27lLKNgWGYGX2ax3LyT\n"
|
|
|
|
"3nzI1Y5oLs4kPKTsMM5ft9aokwf417lKoCRlZc9ptfRbgxDx90c9GtWVmkrmDvCK\n"
|
|
|
|
"ae59TMoXIiGfZiwWT6KKq5Zm9/Fu2Il3B2vHGkKJYKixmiBJRKp/AgMBAAE=\n"
|
2004-02-26 22:25:51 +01:00
|
|
|
"-----END RSA PUBLIC KEY-----\n"
|
2004-05-07 00:47:15 +02:00
|
|
|
"accept 62.245.184.24:25\n"
|
|
|
|
"accept 62.116.124.106:6666-6670\n"
|
|
|
|
"accept *:48099\n"
|
2004-04-29 10:10:13 +02:00
|
|
|
"reject *:*\n"
|
2004-02-26 22:25:51 +01:00
|
|
|
"router-signature\n"
|
|
|
|
"-----BEGIN SIGNATURE-----\n"
|
2004-05-07 00:47:15 +02:00
|
|
|
"qh/xRoqfLNFzPaB8VdpbdMAwRyuk5qjx4LeLVQ2pDwTZ55PqmG99+VKUNte2WTTD\n"
|
|
|
|
"7dZEA7um2rueohGe4nYmvbhJWr20/I0ZxmWDRDvFy0b5nwzDMGvLvDw95Zu/XJQ2\n"
|
|
|
|
"md32NE3y9VZCfbCN+GlvETX3fdR3Svzcm8Kzesg2/s4=\n"
|
2004-02-26 22:25:51 +01:00
|
|
|
"-----END SIGNATURE-----\n"
|
|
|
|
;
|
|
|
|
|
2004-02-26 23:56:36 +01:00
|
|
|
int config_assign_default_dirservers(void) {
|
2004-05-17 22:31:01 +02:00
|
|
|
if(router_load_routerlist_from_string(default_dirservers_string, 1) < 0) {
|
2004-02-26 23:56:36 +01:00
|
|
|
log_fn(LOG_WARN,"Bug: the default dirservers internal string is corrupt.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/** Set <b>options</b> to a reasonable default.
|
|
|
|
*
|
2004-07-05 00:48:11 +02:00
|
|
|
* Call this function when we can't find any torrc config file.
|
2004-02-26 22:25:51 +01:00
|
|
|
*/
|
2004-07-05 00:48:11 +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-07-05 00:48:11 +02:00
|
|
|
config_free_lines(options->ExitPolicy);
|
|
|
|
options->ExitPolicy = config_line_prepend(NULL, "ExitPolicy", "reject *:*");
|
|
|
|
|
2004-02-26 22:25:51 +01:00
|
|
|
/* plus give them a dirservers file */
|
2004-02-26 23:56:36 +01:00
|
|
|
if(config_assign_default_dirservers() < 0)
|
2004-02-26 22:25:51 +01:00
|
|
|
return -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/** Print a usage message for tor. */
|
2004-02-26 23:56:36 +01: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"
|
2003-11-10 09:06:55 +01:00
|
|
|
"-s <IP>\t\t\tPort to bind to for Socks\n"
|
2003-10-25 14:01:09 +02:00
|
|
|
);
|
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"
|
|
|
|
"-p <file>\t\tPID file\n"
|
|
|
|
);
|
2003-10-20 03:19:54 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/**
|
|
|
|
* Adjust <b>options</b> to contain a reasonable value for Address.
|
|
|
|
*/
|
2004-08-16 13:43:18 +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);
|
|
|
|
|
|
|
|
if(address) {
|
|
|
|
strlcpy(hostname,address,sizeof(hostname));
|
|
|
|
} 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-08-16 13:43:18 +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-08-16 13:43:18 +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-03-15 05:57:24 +01:00
|
|
|
memcpy(&in.s_addr, rent->h_addr,rent->h_length);
|
2004-03-14 19:12:59 +01:00
|
|
|
}
|
2004-03-15 05:57:24 +01: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-08-16 13:43:18 +02:00
|
|
|
log_fn(LOG_DEBUG,"Resolved Address to %s.", inet_ntoa(in));
|
|
|
|
*addr = ntohl(in.s_addr);
|
2004-03-14 19:12:59 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-07-13 20:23:40 +02:00
|
|
|
static char *get_default_nickname(void)
|
|
|
|
{
|
|
|
|
char localhostname[256];
|
|
|
|
char *cp, *out, *outp;
|
|
|
|
|
|
|
|
if(gethostname(localhostname,sizeof(localhostname)) < 0) {
|
|
|
|
log_fn(LOG_WARN,"Error obtaining local hostname");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
/* Put it in lowercase; stop at the first dot. */
|
|
|
|
for(cp = localhostname; *cp; ++cp) {
|
|
|
|
if (*cp == '.') {
|
|
|
|
*cp = '\0';
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
*cp = tolower(*cp);
|
|
|
|
}
|
|
|
|
/* Strip invalid characters. */
|
|
|
|
cp = localhostname;
|
|
|
|
out = outp = tor_malloc(strlen(localhostname)+1);
|
|
|
|
while (*cp) {
|
|
|
|
if (strchr(LEGAL_NICKNAME_CHARACTERS, *cp))
|
|
|
|
*outp++ = *cp++;
|
|
|
|
else
|
|
|
|
cp++;
|
|
|
|
}
|
|
|
|
*outp = '\0';
|
|
|
|
/* 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-02-26 23:56:36 +01: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-11-13 07:49:25 +01:00
|
|
|
tor_free(options->RecommendedVersions);
|
2003-10-22 09:55:44 +02:00
|
|
|
tor_free(options->User);
|
|
|
|
tor_free(options->Group);
|
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-08-16 22:47:00 +02:00
|
|
|
SMARTLIST_FOREACH(options->FirewallPorts, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(options->FirewallPorts);
|
2003-10-21 11:48:17 +02:00
|
|
|
}
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/** Set <b>options</b> to hold reasonable defaults for most options. */
|
2004-02-26 23:56:36 +01:00
|
|
|
static void init_options(or_options_t *options) {
|
2003-07-05 09:10:34 +02:00
|
|
|
/* give reasonable values for each option. Defaults to zero. */
|
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;
|
2003-10-21 11:48:17 +02:00
|
|
|
}
|
|
|
|
|
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. */
|
2003-10-21 11:48:17 +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
|
|
|
|
|
|
|
if(first_load) { /* first time we're called. save commandline args */
|
|
|
|
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 */
|
2003-12-03 23:00:20 +01:00
|
|
|
if(options->PidFile)
|
|
|
|
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
|
|
|
|
2003-10-20 03:19:54 +02:00
|
|
|
if(argc > 1 && (!strcmp(argv[1], "-h") || !strcmp(argv[1],"--help"))) {
|
|
|
|
print_usage();
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
2004-03-02 06:19:01 +01:00
|
|
|
if(argc > 1 && (!strcmp(argv[1],"--version"))) {
|
|
|
|
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;
|
|
|
|
while(i < argc-1 && strcmp(argv[i],"-f")) {
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
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 if (file_status(CONFDIR "/torrc")==FN_FILE) {
|
|
|
|
/* didn't find one, try CONFDIR */
|
|
|
|
fname = tor_strdup(CONFDIR "/torrc");
|
|
|
|
using_default_torrc = 1;
|
|
|
|
} else {
|
|
|
|
char *fn = expand_filename("~/.torrc");
|
|
|
|
if (file_status(fn)==FN_FILE) {
|
|
|
|
fname = fn;
|
|
|
|
} else {
|
|
|
|
tor_free(fn);
|
|
|
|
fname = tor_strdup(CONFDIR "/torrc");
|
|
|
|
}
|
2004-02-26 22:25:51 +01:00
|
|
|
using_default_torrc = 1;
|
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
|
|
|
}
|
|
|
|
log(LOG_DEBUG,"Opening config file '%s'",fname);
|
|
|
|
|
|
|
|
cf = config_open(fname);
|
2003-09-26 12:03:50 +02:00
|
|
|
if(!cf) {
|
2004-02-26 22:25:51 +01:00
|
|
|
if(using_default_torrc == 1) {
|
2004-03-30 05:15:53 +02:00
|
|
|
log(LOG_NOTICE, "Configuration file '%s' not present, using reasonable defaults.",fname);
|
2004-07-16 21:43:58 +02:00
|
|
|
tor_free(fname);
|
|
|
|
if(config_assign_defaults(options) < 0) {
|
2004-02-26 22:25:51 +01:00
|
|
|
return -1;
|
2004-07-16 21:43:58 +02:00
|
|
|
}
|
2004-02-26 22:25:51 +01:00
|
|
|
} else {
|
|
|
|
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-02-26 22:25:51 +01:00
|
|
|
cl = config_get_lines(cf);
|
|
|
|
if(!cl) return -1;
|
2004-03-02 06:00:50 +01:00
|
|
|
if(config_assign(options,cl) < 0)
|
|
|
|
return -1;
|
2004-02-26 22:25:51 +01:00
|
|
|
config_free_lines(cl);
|
|
|
|
config_close(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-03-02 06:00:50 +01:00
|
|
|
if(config_assign(options,cl) < 0)
|
|
|
|
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 */
|
2003-11-13 07:49:25 +01:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2004-02-29 00:30:41 +01: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;
|
|
|
|
}
|
|
|
|
|
2003-03-18 02:49:55 +01:00
|
|
|
if(options->ORPort < 0) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log(LOG_WARN,"ORPort option can't be negative.");
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2004-07-18 23:47:04 +02:00
|
|
|
if (options->Nickname == NULL) {
|
2004-08-04 04:15:22 +02:00
|
|
|
if(server_mode()) {
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
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-08-16 13:43:18 +02:00
|
|
|
if(server_mode()) {
|
|
|
|
/* confirm that our address isn't broken, so we can complain now */
|
|
|
|
uint32_t tmp;
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2003-10-21 11:48:17 +02:00
|
|
|
if(options->SocksPort < 0) {
|
|
|
|
log(LOG_WARN,"SocksPort option can't be negative.");
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2003-11-10 09:06:55 +01:00
|
|
|
if(options->SocksPort == 0 && options->ORPort == 0) {
|
|
|
|
log(LOG_WARN,"SocksPort and ORPort are both undefined? Quitting.");
|
|
|
|
result = -1;
|
2003-12-17 22:09:31 +01:00
|
|
|
}
|
2003-11-10 09:06:55 +01:00
|
|
|
|
2003-03-18 02:49:55 +01:00
|
|
|
if(options->DirPort < 0) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log(LOG_WARN,"DirPort option can't be negative.");
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2004-08-15 22:14:44 +02:00
|
|
|
if(options->StrictExitNodes && !strlen(options->ExitNodes)) {
|
|
|
|
log(LOG_WARN,"StrictExitNodes set, but no ExitNodes listed.");
|
|
|
|
}
|
|
|
|
|
|
|
|
if(options->StrictEntryNodes && !strlen(options->EntryNodes)) {
|
|
|
|
log(LOG_WARN,"StrictEntryNodes set, but no EntryNodes listed.");
|
|
|
|
}
|
|
|
|
|
2004-07-05 00:48:11 +02:00
|
|
|
if(options->AuthoritativeDir && options->RecommendedVersions == NULL) {
|
2004-03-10 08:44:31 +01:00
|
|
|
log(LOG_WARN,"Directory servers must configure RecommendedVersions.");
|
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2004-06-21 06:37:27 +02:00
|
|
|
if(options->AuthoritativeDir && !options->DirPort) {
|
|
|
|
log(LOG_WARN,"Running as authoritative directory, but no DirPort set.");
|
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2004-07-20 12:17:43 +02:00
|
|
|
if(options->AuthoritativeDir && !options->ORPort) {
|
|
|
|
log(LOG_WARN,"Running as authoritative directory, but no ORPort set.");
|
|
|
|
result = -1;
|
|
|
|
}
|
2004-07-13 09:42:20 +02:00
|
|
|
|
2004-07-20 12:17:43 +02:00
|
|
|
if(options->AuthoritativeDir && options->ClientOnly) {
|
|
|
|
log(LOG_WARN,"Running as authoritative directory, but ClientOnly also set.");
|
|
|
|
result = -1;
|
|
|
|
}
|
2004-07-13 09:42:20 +02:00
|
|
|
|
2004-08-16 22:47:00 +02:00
|
|
|
if(options->FascistFirewall && !options->FirewallPorts) {
|
|
|
|
options->FirewallPorts = smartlist_create();
|
|
|
|
smartlist_add(options->FirewallPorts, "80");
|
|
|
|
smartlist_add(options->FirewallPorts, "443");
|
|
|
|
}
|
|
|
|
if(options->FirewallPorts) {
|
|
|
|
SMARTLIST_FOREACH(options->FirewallPorts, const char *, cp,
|
|
|
|
{ i = atoi(cp);
|
|
|
|
if (i < 1 || i > 65535) {
|
|
|
|
log(LOG_WARN, "Port %s out of range in FirewallPorts", cp);
|
|
|
|
result=-1;
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2004-07-18 23:47:04 +02:00
|
|
|
if(options->SocksPort >= 1 &&
|
2003-11-14 00:01:56 +01:00
|
|
|
(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;
|
|
|
|
}
|
|
|
|
|
2003-03-18 02:49:55 +01:00
|
|
|
if(options->MaxConn < 1) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log(LOG_WARN,"MaxConn option must be a non-zero positive integer.");
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(options->MaxConn >= MAXCONNECTIONS) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log(LOG_WARN,"MaxConn option must be less than %d.", MAXCONNECTIONS);
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2003-10-01 01:06:23 +02:00
|
|
|
if(options->DirFetchPostPeriod < 1) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log(LOG_WARN,"DirFetchPostPeriod option must be positive.");
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
2004-04-25 00:17:50 +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;
|
|
|
|
}
|
2002-11-23 07:49:01 +01: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-04-05 02:47:48 +02:00
|
|
|
/* XXX look at the various nicknamelists and make sure they're
|
|
|
|
* valid and don't have hostnames that are too long.
|
|
|
|
*/
|
|
|
|
|
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-05-20 21:47:28 +02:00
|
|
|
static int add_single_log(struct config_line_t *level_opt,
|
2004-05-19 22:07:08 +02:00
|
|
|
struct config_line_t *file_opt,
|
|
|
|
int isDaemon)
|
|
|
|
{
|
|
|
|
int levelMin=-1, levelMax=-1;
|
|
|
|
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);
|
|
|
|
if (levelMin<0) {
|
2004-05-20 21:47:28 +02:00
|
|
|
log_fn(LOG_WARN, "Unrecognized log severity '%s': must be one of err|warn|notice|info|debug", tmp_sev);
|
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
}
|
|
|
|
tor_free(tmp_sev);
|
|
|
|
levelMax = parse_log_level(cp+1);
|
|
|
|
if (levelMax<0) {
|
2004-05-20 21:47:28 +02:00
|
|
|
log_fn(LOG_WARN, "Unrecognized log severity '%s': must be one of err|warn|notice|info|debug", cp+1);
|
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
levelMin = parse_log_level(level_opt->value);
|
|
|
|
if (levelMin<0) {
|
2004-05-20 21:47:28 +02:00
|
|
|
log_fn(LOG_WARN, "Unrecognized log severity '%s': must be one of err|warn|notice|info|debug", level_opt->value);
|
|
|
|
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-05-20 21:47:28 +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-05-20 21:47:28 +02:00
|
|
|
if (add_single_log(opt, opt->next, options->RunAsDaemon)<0)
|
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
opt = opt->next->next;
|
|
|
|
} else if (!opt->next) {
|
2004-05-20 21:47:28 +02:00
|
|
|
if (add_single_log(opt, NULL, options->RunAsDaemon)<0)
|
|
|
|
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-05-20 21:47:28 +02:00
|
|
|
if (add_single_log(opt->next, opt, options->RunAsDaemon)<0)
|
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
opt = opt->next->next;
|
|
|
|
} else {
|
|
|
|
/* LogFile followed by LogFile or end of list. */
|
2004-05-20 21:47:28 +02:00
|
|
|
if (add_single_log(NULL, opt, options->RunAsDaemon)<0)
|
|
|
|
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-05-20 21:47:28 +02:00
|
|
|
if (add_file_log(LOG_DEBUG, LOG_ERR, options->DebugLogFile)<0)
|
|
|
|
return -1;
|
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
|
|
|
}
|
|
|
|
|
2004-08-15 10:15:12 +02:00
|
|
|
/** XXX008 DOCDOC */
|
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;
|
|
|
|
char *e, *s;
|
|
|
|
int last=0;
|
|
|
|
char line[1024];
|
|
|
|
|
|
|
|
if (!cfg)
|
|
|
|
return;
|
|
|
|
nextp = dest;
|
|
|
|
while (*nextp)
|
|
|
|
nextp = &((*nextp)->next);
|
|
|
|
|
|
|
|
for (; cfg; cfg = cfg->next) {
|
|
|
|
s = cfg->value;
|
|
|
|
for (;;) {
|
|
|
|
e = strchr(s,',');
|
|
|
|
if(!e) {
|
|
|
|
last = 1;
|
|
|
|
strncpy(line,s,1023);
|
|
|
|
} else {
|
|
|
|
memcpy(line,s, ((e-s)<1023)?(e-s):1023);
|
|
|
|
line[e-s] = 0;
|
|
|
|
}
|
|
|
|
line[1023]=0;
|
|
|
|
log_fn(LOG_DEBUG,"Adding new entry '%s'",line);
|
|
|
|
*nextp = router_parse_exit_policy_from_string(line);
|
|
|
|
if(*nextp) {
|
|
|
|
nextp = &((*nextp)->next);
|
|
|
|
} else {
|
|
|
|
log_fn(LOG_WARN,"Malformed exit policy %s; skipping.", line);
|
|
|
|
}
|
|
|
|
if (last)
|
|
|
|
break;
|
|
|
|
s = e+1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void exit_policy_free(struct exit_policy_t *p) {
|
|
|
|
struct exit_policy_t *e;
|
|
|
|
while (p) {
|
|
|
|
e = p;
|
|
|
|
p = p->next;
|
|
|
|
tor_free(e->string);
|
|
|
|
tor_free(e);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-06-21 06:37:27 +02:00
|
|
|
const char *get_data_directory(or_options_t *options) {
|
|
|
|
const char *d;
|
|
|
|
if (options->DataDirectory)
|
|
|
|
d = options->DataDirectory;
|
2004-07-22 02:13:42 +02:00
|
|
|
else if (server_mode())
|
2004-06-21 06:37:27 +02:00
|
|
|
d = "~/.tor";
|
2004-07-22 02:13:42 +02:00
|
|
|
else
|
|
|
|
d = NULL; /* XXX008 don't create datadir until we have something
|
|
|
|
we'll be putting in it */
|
2004-06-21 06:37:27 +02:00
|
|
|
|
2004-07-22 02:13:42 +02:00
|
|
|
if (d && strncmp(d,"~/",2)==0) {
|
2004-07-16 21:43:58 +02:00
|
|
|
char *fn = expand_filename(d);
|
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:
|
|
|
|
*/
|