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$ */
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
#include "or.h"
|
2002-10-03 04:17:41 +02:00
|
|
|
|
2003-09-08 07:16:18 +02:00
|
|
|
/* enumeration of types which option values can take */
|
|
|
|
#define CONFIG_TYPE_STRING 0
|
|
|
|
#define CONFIG_TYPE_CHAR 1
|
|
|
|
#define CONFIG_TYPE_INT 2
|
|
|
|
#define CONFIG_TYPE_LONG 3
|
|
|
|
#define CONFIG_TYPE_DOUBLE 4
|
|
|
|
#define CONFIG_TYPE_BOOL 5
|
2004-03-31 23:35:23 +02:00
|
|
|
#define CONFIG_TYPE_LINELIST 6
|
2003-09-08 07:16:18 +02:00
|
|
|
|
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);
|
|
|
|
static int config_compare(struct config_line_t *c, char *key, int type, void *arg);
|
|
|
|
static int config_assign(or_options_t *options, struct config_line_t *list);
|
2003-09-08 07:16:18 +02:00
|
|
|
|
2002-11-23 07:49:01 +01:00
|
|
|
/* open configuration file for reading */
|
2003-09-08 07:16:18 +02:00
|
|
|
static FILE *config_open(const unsigned char *filename) {
|
2002-11-23 07:49:01 +01:00
|
|
|
assert(filename);
|
|
|
|
if (strspn(filename,CONFIG_LEGAL_FILENAME_CHARACTERS) != strlen(filename)) {
|
|
|
|
/* filename has illegal letters */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return fopen(filename, "r");
|
|
|
|
}
|
|
|
|
|
|
|
|
/* close configuration file */
|
2003-09-08 07:16:18 +02:00
|
|
|
static int config_close(FILE *f) {
|
2002-11-23 07:49:01 +01:00
|
|
|
assert(f);
|
|
|
|
return fclose(f);
|
|
|
|
}
|
|
|
|
|
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-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;
|
|
|
|
}
|
|
|
|
|
2003-09-29 09:50:08 +02:00
|
|
|
/* parse the config file and strdup into key/value strings. Return list,
|
|
|
|
* or NULL if parsing the file failed.
|
2002-12-03 23:18:23 +01:00
|
|
|
* Warn and ignore mangled 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-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-03-31 23:35:23 +02:00
|
|
|
static int config_compare(struct config_line_t *c, char *key, int 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;
|
|
|
|
|
|
|
|
/* 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-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-03-02 06:00:50 +01:00
|
|
|
/* Iterate through list.
|
|
|
|
* For each item, convert as appropriate and assign to 'options'.
|
|
|
|
* 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-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) ||
|
|
|
|
|
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) ||
|
|
|
|
config_compare(list, "DirBindAddress", CONFIG_TYPE_STRING, &options->DirBindAddress) ||
|
|
|
|
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) ||
|
2003-10-08 00:04:17 +02:00
|
|
|
config_compare(list, "ExitPolicy", CONFIG_TYPE_STRING, &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
|
|
|
|
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
|
|
|
|
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) ||
|
|
|
|
|
|
|
|
config_compare(list, "LogLevel", CONFIG_TYPE_STRING, &options->LogLevel) ||
|
|
|
|
config_compare(list, "LogFile", CONFIG_TYPE_STRING, &options->LogFile) ||
|
|
|
|
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) ||
|
|
|
|
config_compare(list, "ORBindAddress", CONFIG_TYPE_STRING, &options->ORBindAddress) ||
|
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) ||
|
2003-11-14 00:01:56 +01:00
|
|
|
config_compare(list, "RecommendedVersions",CONFIG_TYPE_STRING, &options->RecommendedVersions) ||
|
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) ||
|
|
|
|
config_compare(list, "SocksBindAddress",CONFIG_TYPE_STRING,&options->SocksBindAddress) ||
|
|
|
|
|
|
|
|
config_compare(list, "TrafficShaping", CONFIG_TYPE_BOOL, &options->TrafficShaping) ||
|
|
|
|
|
2004-03-21 04:03:10 +01:00
|
|
|
config_compare(list, "User", CONFIG_TYPE_STRING, &options->User) ||
|
2004-03-31 23:35:23 +02:00
|
|
|
config_compare(list, "RunTesting", CONFIG_TYPE_BOOL, &options->RunTesting) ||
|
|
|
|
config_compare(list, "HiddenServiceDir", CONFIG_TYPE_LINELIST, &options->RendConfigLines) ||
|
|
|
|
config_compare(list, "HiddenServicePort", CONFIG_TYPE_LINELIST, &options->RendConfigLines)
|
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
|
|
|
/* XXX are there any other specifiers we want to give so making
|
|
|
|
* a several-thousand-byte string is less painful? */
|
|
|
|
const char default_dirservers_string[] =
|
|
|
|
"router moria1 moria.mit.edu 9001 9021 9031 800000\n"
|
|
|
|
"platform Tor 0.0.2pre8 on Linux moria.mit.edu 2.4.18-27.7.xbigmem #1 SMP Fri Mar 14 05:08:50 EST 2003 i686\n"
|
|
|
|
"published 2003-09-30 23:14:08\n"
|
|
|
|
"onion-key\n"
|
|
|
|
"-----BEGIN RSA PUBLIC KEY-----\n"
|
|
|
|
"MIGJAoGBANoIvHieyHUTzIacbnWOnyTyzGrLOdXqbcjz2GGMxyHEd5K1bO1ZBNHP\n"
|
|
|
|
"9i5qLQpN5viFk2K2rEGuG8tFgDEzSWZEtBqv3NVfUdiumdERWMBwlaQ0MVK4C+jf\n"
|
|
|
|
"y5gZ8KI3o9ZictgPS1AQF+Kk932/vIHTuRIUKb4ILTnQilNvID0NAgMBAAE=\n"
|
|
|
|
"-----END RSA PUBLIC KEY-----\n"
|
|
|
|
"link-key\n"
|
|
|
|
"-----BEGIN RSA PUBLIC KEY-----\n"
|
|
|
|
"MIGJAoGBAPt97bGDd9siVjPd7Xuq2s+amMEOLIj9961aSdP6/OT+BS1Q4TX2dNOX\n"
|
|
|
|
"ZNAl63Z2fQISsR81+nfoqRLYCKxhajsD7LRvRTaRwUrWemVqFevmZ4nJrHw6FoU3\n"
|
|
|
|
"xNUIHRMA8X2DZ+l5qgnWZb7JU50ohhX5OpMSyysXnik51J8hD5mBAgMBAAE=\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"
|
|
|
|
"router-signature\n"
|
|
|
|
"-----BEGIN SIGNATURE-----\n"
|
|
|
|
"Td3zb5d6uxO8oYGlmEHGzIdLuVm9s1Afqtm29JvRnnviQ36j6FZPlzPUaMVOUayn\n"
|
|
|
|
"Wtz/CbaMj7mHSufpQ68wCLb1lQrtQkn7MkAWcQPIvZjpYh3UrcWrpfm7f/D+nKeN\n"
|
|
|
|
"Z7UovF36xhCacjATNHhQNHHZHH6yONwN+Rf/N4kyPHw=\n"
|
|
|
|
"-----END SIGNATURE-----\n"
|
|
|
|
"\n"
|
|
|
|
"router moria2 moria.mit.edu 9002 9022 9032 800000\n"
|
|
|
|
"platform Tor 0.0.2pre8 on Linux moria.mit.edu 2.4.18-27.7.xbigmem #1 SMP Fri Mar 14 05:08:50 EST 2003 i686\n"
|
|
|
|
"published 2003-09-30 23:14:05\n"
|
|
|
|
"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"
|
|
|
|
"link-key\n"
|
|
|
|
"-----BEGIN RSA PUBLIC KEY-----\n"
|
|
|
|
"MIGJAoGBAN7JVeCIJ7+0ZJew5ScOU58rTUqjGt1Z1Rkursc7WabEb8jno45VZwIs\n"
|
|
|
|
"dkjnl31i36KHyyS7kQdHgkvG5EiyZiRipFAcoTaYv3Gvf1No9cXL6IhT3y/37dJ/\n"
|
|
|
|
"kFPEMb/G2wdkJCC+D8fMwHBwMuqAg0JGuhoBOz0ArCgK3fq0BLilAgMBAAE=\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"
|
|
|
|
"router-signature\n"
|
|
|
|
"-----BEGIN SIGNATURE-----\n"
|
|
|
|
"X10a9Oc0LKNYKLDVzjRTIVT3NnE0y+xncllDDHSJSXR97fz3MBHGDqhy0Vgha/fe\n"
|
|
|
|
"H/Y2E59oG01lYQ73j3JN+ibsCMtkzJDx2agCpV0LmakAD9ekHrYDWm/S41Ru6kf+\n"
|
|
|
|
"PsyHpXlh7cZuGEX4U1pblSDFrQZ9L1vTkpfW+COzEvI=\n"
|
|
|
|
"-----END SIGNATURE-----\n"
|
|
|
|
"\n"
|
|
|
|
"router moria3 moria.mit.edu 9003 9023 9033 800000\n"
|
|
|
|
"platform Tor 0.0.2pre8 on Linux moria.mit.edu 2.4.18-27.7.xbigmem #1 SMP Fri Mar 14 05:08:50 EST 2003 i686\n"
|
|
|
|
"published 2003-09-30 23:14:07\n"
|
|
|
|
"onion-key\n"
|
|
|
|
"-----BEGIN RSA PUBLIC KEY-----\n"
|
|
|
|
"MIGJAoGBANS6J/Er9fYo03fjUUVesc7We9Z6xIevyDJH39pYS4NUlcr5ExYgSVFJ\n"
|
|
|
|
"95aLCNx1x8Rf5YtiBKYuT3plBO/+rfuX+0iAGNkz/y3SlJVGz6aeptU3wN8CkvCL\n"
|
|
|
|
"zATEcnl4QSPhHX0wFB9A3t7wZ+Bat1PTI029lax/BkoS9JG5onHPAgMBAAE=\n"
|
|
|
|
"-----END RSA PUBLIC KEY-----\n"
|
|
|
|
"link-key\n"
|
|
|
|
"-----BEGIN RSA PUBLIC KEY-----\n"
|
|
|
|
"MIGJAoGBAKUMY8p+7LBu7dEJnOR9HqbfcD6c4/f9GqJt3o29uu4XJPD8z2XGVBik\n"
|
|
|
|
"pZBLijhYS6U7GFg0NLR4zBlsLyB8TxHeaz5KJidJjy+BfC01jz1xwVTYDlmGVpc1\n"
|
|
|
|
"0mw0Ag0ND6aOQKKhelxhTI3Bf0R9olEXuSUKEWx3EMIz2qhLd9oDAgMBAAE=\n"
|
|
|
|
"-----END RSA PUBLIC KEY-----\n"
|
|
|
|
"signing-key\n"
|
|
|
|
"-----BEGIN RSA PUBLIC KEY-----\n"
|
|
|
|
"MIGJAoGBAMqgq83cwzSid2LSvzsn2rvkD8U0tWvqF6PuQAsKP3QHFqtBO+66pnIm\n"
|
|
|
|
"CbiY2e6o01tmR47t557LuUCodEc8Blggxjg3ZEzvP42hsGB9LwQbcrU7grPRk0G0\n"
|
|
|
|
"IltsOF9TZ+66gCeU7LxExLdAMqT2Tx6VT4IREPJMeNxSiceEjbABAgMBAAE=\n"
|
|
|
|
"-----END RSA PUBLIC KEY-----\n"
|
|
|
|
"router-signature\n"
|
|
|
|
"-----BEGIN SIGNATURE-----\n"
|
|
|
|
"GWpK2Ux/UwDaNUHwq+Xn7denyYFGS8SIWwqiMgHyUzc5wj1t2gWubJ/rMyGL59U3\n"
|
|
|
|
"o6L/9qV34aa5UyNNBHXwYkxy7ixgPURaRYpAbkQKPU3ew8BgNXG/MNLYllIUkrbb\n"
|
|
|
|
"h6G5u8RGbto+Nby/OjIh9TqdgK/B1sOdwAHI/IXiDoY=\n"
|
|
|
|
"-----END SIGNATURE-----\n"
|
|
|
|
;
|
|
|
|
|
2004-02-26 23:56:36 +01:00
|
|
|
int config_assign_default_dirservers(void) {
|
|
|
|
if(router_set_routerlist_from_string(default_dirservers_string) < 0) {
|
|
|
|
log_fn(LOG_WARN,"Bug: the default dirservers internal string is corrupt.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-02-26 22:25:51 +01:00
|
|
|
/* Call this function when they're using the default torrc but
|
|
|
|
* we can't find it. For now, just hard-code what comes in the
|
|
|
|
* default torrc.
|
|
|
|
*/
|
|
|
|
static int config_assign_default(or_options_t *options) {
|
|
|
|
|
|
|
|
/* set them up as a client only */
|
|
|
|
options->SocksPort = 9050;
|
|
|
|
|
|
|
|
/* 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;
|
|
|
|
}
|
|
|
|
|
2003-10-25 14:01:09 +02:00
|
|
|
/* prints the usage of 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-03-14 23:47:11 +01:00
|
|
|
static int resolve_my_address(or_options_t *options) {
|
2004-03-14 19:12:59 +01:00
|
|
|
struct in_addr in;
|
|
|
|
struct hostent *rent;
|
|
|
|
char localhostname[256];
|
2004-03-15 05:57:24 +01:00
|
|
|
int explicit_ip=1;
|
2004-03-14 19:12:59 +01:00
|
|
|
|
|
|
|
if(!options->Address) { /* 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
|
|
|
|
|
|
|
if(gethostname(localhostname,sizeof(localhostname)) < 0) {
|
|
|
|
log_fn(LOG_WARN,"Error obtaining local hostname");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
#if 0 /* don't worry about complaining, as long as it resolves */
|
|
|
|
if(!strchr(localhostname,'.')) {
|
|
|
|
log_fn(LOG_WARN,"fqdn '%s' has only one element. Misconfigured machine?",address);
|
|
|
|
log_fn(LOG_WARN,"Try setting the Address line in your config file.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
options->Address = tor_strdup(localhostname);
|
|
|
|
log_fn(LOG_DEBUG,"Guessed local host name as '%s'",options->Address);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* now we know options->Address is set. resolve it and keep only the IP */
|
|
|
|
|
2004-03-15 05:57:24 +01:00
|
|
|
if(tor_inet_aton(options->Address, &in) == 0) {
|
|
|
|
/* then we have to resolve it */
|
|
|
|
explicit_ip = 0;
|
|
|
|
rent = (struct hostent *)gethostbyname(options->Address);
|
|
|
|
if (!rent) {
|
|
|
|
log_fn(LOG_WARN,"Could not resolve Address %s. Failing.", options->Address);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
assert(rent->h_length == 4);
|
|
|
|
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-03-14 19:12:59 +01:00
|
|
|
options->Address, inet_ntoa(in));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
tor_free(options->Address);
|
|
|
|
options->Address = tor_strdup(inet_ntoa(in));
|
|
|
|
log_fn(LOG_DEBUG,"Resolved Address to %s.", options->Address);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-02-26 23:56:36 +01:00
|
|
|
static void free_options(or_options_t *options) {
|
2003-10-21 11:48:17 +02:00
|
|
|
tor_free(options->LogLevel);
|
|
|
|
tor_free(options->LogFile);
|
|
|
|
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);
|
2003-10-21 11:48:17 +02:00
|
|
|
tor_free(options->ExitPolicy);
|
2003-10-22 09:55:44 +02:00
|
|
|
tor_free(options->SocksBindAddress);
|
|
|
|
tor_free(options->ORBindAddress);
|
2003-10-25 14:01:09 +02:00
|
|
|
tor_free(options->DirBindAddress);
|
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);
|
2003-10-21 11:48:17 +02:00
|
|
|
}
|
2002-11-23 07:49:01 +01:00
|
|
|
|
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-03-30 05:15:53 +02:00
|
|
|
options->LogLevel = tor_strdup("notice");
|
2003-11-12 20:34:34 +01:00
|
|
|
options->ExitNodes = tor_strdup("");
|
|
|
|
options->EntryNodes = tor_strdup("");
|
2004-02-28 06:09:37 +01:00
|
|
|
options->ExcludeNodes = tor_strdup("");
|
2004-02-18 08:23:38 +01:00
|
|
|
options->ExitPolicy = tor_strdup("");
|
2003-10-21 11:48:17 +02:00
|
|
|
options->SocksBindAddress = tor_strdup("127.0.0.1");
|
|
|
|
options->ORBindAddress = tor_strdup("0.0.0.0");
|
2003-10-25 14:01:09 +02:00
|
|
|
options->DirBindAddress = tor_strdup("0.0.0.0");
|
2004-03-10 08:44:31 +01:00
|
|
|
options->RecommendedVersions = NULL;
|
2003-10-15 20:50:16 +02:00
|
|
|
options->loglevel = LOG_INFO;
|
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;
|
2003-10-21 11:48:17 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* return 0 if success, <0 if failure. */
|
|
|
|
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 */
|
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
|
|
|
fname = argv[i+1];
|
2004-02-26 22:25:51 +01:00
|
|
|
using_default_torrc = 0;
|
2003-10-15 09:19:38 +02:00
|
|
|
} else { /* didn't find one, try CONFDIR */
|
|
|
|
fname = 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-02-26 22:25:51 +01:00
|
|
|
if(config_assign_default(options) < 0)
|
|
|
|
return -1;
|
|
|
|
} else {
|
|
|
|
log(LOG_WARN, "Unable to open configuration file '%s'.",fname);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
} else { /* it opened successfully. use it. */
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2002-11-23 07:49:01 +01:00
|
|
|
if(options->LogLevel) {
|
2003-09-27 09:21:36 +02:00
|
|
|
if(!strcmp(options->LogLevel,"err"))
|
2002-11-23 07:49:01 +01:00
|
|
|
options->loglevel = LOG_ERR;
|
2003-10-10 03:48:32 +02:00
|
|
|
else if(!strcmp(options->LogLevel,"warn"))
|
|
|
|
options->loglevel = LOG_WARN;
|
2004-03-30 05:15:53 +02:00
|
|
|
else if(!strcmp(options->LogLevel,"notice"))
|
|
|
|
options->loglevel = LOG_NOTICE;
|
2002-11-23 07:49:01 +01:00
|
|
|
else if(!strcmp(options->LogLevel,"info"))
|
|
|
|
options->loglevel = LOG_INFO;
|
|
|
|
else if(!strcmp(options->LogLevel,"debug"))
|
|
|
|
options->loglevel = LOG_DEBUG;
|
|
|
|
else {
|
2004-03-30 05:15:53 +02:00
|
|
|
log(LOG_WARN,"LogLevel must be one of err|warn|notice|info|debug.");
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -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;
|
|
|
|
}
|
|
|
|
|
2003-11-20 18:49:45 +01:00
|
|
|
if(options->ORPort && options->DataDirectory == NULL) {
|
|
|
|
log(LOG_WARN,"DataDirectory option required if ORPort is set, but not found.");
|
2003-05-08 00:40:03 +02:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2004-03-20 21:28:53 +01:00
|
|
|
if (options->ORPort) {
|
|
|
|
if (options->Nickname == NULL) {
|
|
|
|
log_fn(LOG_WARN,"Nickname required if ORPort is set, but not found.");
|
|
|
|
result = -1;
|
|
|
|
} else if (strspn(options->Nickname, LEGAL_NICKNAME_CHARACTERS) !=
|
|
|
|
strlen(options->Nickname)) {
|
|
|
|
log_fn(LOG_WARN, "Nickname '%s' contains illegal characters.", options->Nickname);
|
|
|
|
result = -1;
|
|
|
|
}
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
|
|
|
|
2004-03-04 02:53:56 +01:00
|
|
|
if(options->ORPort) { /* get an IP for ourselves */
|
2004-03-14 19:12:59 +01:00
|
|
|
if(resolve_my_address(options) < 0)
|
|
|
|
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-03-10 08:44:31 +01:00
|
|
|
if(options->DirPort && options->RecommendedVersions == NULL) {
|
|
|
|
log(LOG_WARN,"Directory servers must configure RecommendedVersions.");
|
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2003-10-21 11:48:17 +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;
|
|
|
|
}
|
|
|
|
|
|
|
|
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-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
|
|
|
}
|
|
|
|
|
2003-04-07 04:12:02 +02:00
|
|
|
/*
|
|
|
|
Local Variables:
|
|
|
|
mode:c
|
|
|
|
indent-tabs-mode:nil
|
|
|
|
c-basic-offset:2
|
|
|
|
End:
|
|
|
|
*/
|