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
|
|
|
|
|
2003-10-08 00:04:17 +02:00
|
|
|
#define CONFIG_LINE_MAXLEN 4096
|
2003-09-08 07:16:18 +02:00
|
|
|
|
|
|
|
struct config_line {
|
|
|
|
char *key;
|
|
|
|
char *value;
|
|
|
|
struct config_line *next;
|
|
|
|
};
|
|
|
|
|
|
|
|
static FILE *config_open(const unsigned char *filename);
|
|
|
|
static int config_close(FILE *f);
|
|
|
|
static struct config_line *config_get_commandlines(int argc, char **argv);
|
|
|
|
static struct config_line *config_get_lines(FILE *f);
|
|
|
|
static void config_free_lines(struct config_line *front);
|
|
|
|
static int config_compare(struct config_line *c, char *key, int type, void *arg);
|
|
|
|
static void config_assign(or_options_t *options, struct config_line *list);
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2003-09-08 07:16:18 +02:00
|
|
|
static struct config_line *config_get_commandlines(int argc, char **argv) {
|
2002-11-23 07:49:01 +01:00
|
|
|
struct config_line *new;
|
|
|
|
struct config_line *front = NULL;
|
|
|
|
char *s;
|
|
|
|
int i = 1;
|
|
|
|
|
|
|
|
while(i < argc-1) {
|
|
|
|
if(!strcmp(argv[i],"-f")) {
|
|
|
|
// log(LOG_DEBUG,"Commandline: skipping over -f.");
|
|
|
|
i+=2; /* this is the config file option. ignore it. */
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2003-05-20 08:41:23 +02:00
|
|
|
new = tor_malloc(sizeof(struct config_line));
|
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;
|
|
|
|
}
|
|
|
|
|
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. */
|
2003-09-08 07:16:18 +02:00
|
|
|
static struct config_line *config_get_lines(FILE *f) {
|
2002-11-23 07:49:01 +01:00
|
|
|
struct config_line *new;
|
|
|
|
struct config_line *front = NULL;
|
|
|
|
char line[CONFIG_LINE_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) {
|
2003-05-20 08:41:23 +02:00
|
|
|
new = tor_malloc(sizeof(struct config_line));
|
2003-10-04 05:29:09 +02:00
|
|
|
new->key = tor_strdup(key);
|
|
|
|
new->value = tor_strdup(value);
|
2002-11-23 07:49:01 +01:00
|
|
|
|
|
|
|
new->next = front;
|
|
|
|
front = new;
|
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
|
|
|
}
|
|
|
|
|
2003-09-08 07:16:18 +02:00
|
|
|
static void config_free_lines(struct config_line *front) {
|
2002-11-23 07:49:01 +01:00
|
|
|
struct config_line *tmp;
|
|
|
|
|
|
|
|
while(front) {
|
|
|
|
tmp = front;
|
|
|
|
front = tmp->next;
|
|
|
|
|
|
|
|
free(tmp->key);
|
|
|
|
free(tmp->value);
|
|
|
|
free(tmp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-09-08 07:16:18 +02:00
|
|
|
static int config_compare(struct config_line *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) {
|
|
|
|
case CONFIG_TYPE_INT:
|
|
|
|
*(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;
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2003-09-08 07:16:18 +02:00
|
|
|
static void config_assign(or_options_t *options, struct config_line *list) {
|
2002-11-23 07:49:01 +01:00
|
|
|
|
|
|
|
/* iterate through list. for each item convert as appropriate and assign to 'options'. */
|
|
|
|
|
|
|
|
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) ||
|
|
|
|
|
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) ||
|
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) ||
|
|
|
|
config_compare(list, "OnionRouter", CONFIG_TYPE_BOOL, &options->OnionRouter) ||
|
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, "TotalBandwidth", CONFIG_TYPE_INT, &options->TotalBandwidth) ||
|
|
|
|
config_compare(list, "TrafficShaping", CONFIG_TYPE_BOOL, &options->TrafficShaping) ||
|
|
|
|
|
|
|
|
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 {
|
2003-10-10 03:48:32 +02:00
|
|
|
log_fn(LOG_WARN,"Ignoring unknown keyword '%s'.",list->key);
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-10-25 14:01:09 +02:00
|
|
|
/* prints the usage of tor. */
|
2003-10-20 03:19:54 +02:00
|
|
|
void print_usage(void) {
|
2003-10-25 14:01:09 +02:00
|
|
|
printf("tor -f <torrc> [args]\n"
|
|
|
|
"-d <file>\t\tDebug file\n"
|
|
|
|
"-m <max>\t\tMax number of connections\n"
|
2003-11-12 20:34:34 +01:00
|
|
|
"-l <level>\t\tLog level\n"
|
|
|
|
"-t <bandwidth>\t\tTotal bandwidth\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
|
|
|
}
|
|
|
|
|
2003-10-21 11:48:17 +02:00
|
|
|
void free_options(or_options_t *options) {
|
|
|
|
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);
|
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);
|
2003-10-21 11:48:17 +02:00
|
|
|
}
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2003-10-21 11:48:17 +02:00
|
|
|
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));
|
2003-10-21 11:48:17 +02:00
|
|
|
options->LogLevel = tor_strdup("info");
|
2003-11-12 20:34:34 +01:00
|
|
|
options->ExitNodes = tor_strdup("");
|
|
|
|
options->EntryNodes = tor_strdup("");
|
2003-10-22 09:55:44 +02:00
|
|
|
options->ExitPolicy = tor_strdup("reject 127.0.0.1:*");
|
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");
|
2003-11-13 07:49:25 +01:00
|
|
|
options->RecommendedVersions = tor_strdup("none");
|
2003-10-15 20:50:16 +02:00
|
|
|
options->loglevel = LOG_INFO;
|
2003-10-21 11:48:17 +02:00
|
|
|
options->PidFile = 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;
|
2002-11-27 05:08:20 +01:00
|
|
|
options->MaxOnionsPending = 10;
|
2003-04-16 08:18:31 +02:00
|
|
|
options->NewCircuitPeriod = 60; /* once a minute */
|
2003-07-05 09:10:34 +02:00
|
|
|
options->TotalBandwidth = 800000; /* at most 800kB/s total sustained incoming */
|
2003-08-14 05:52:51 +02:00
|
|
|
options->NumCpus = 1;
|
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) {
|
|
|
|
struct config_line *cl;
|
|
|
|
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;
|
|
|
|
int previous_onionrouter = -1;
|
|
|
|
|
|
|
|
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 */
|
|
|
|
previous_pidfile = tor_strdup(options->PidFile);
|
|
|
|
previous_runasdaemon = options->RunAsDaemon;
|
|
|
|
previous_onionrouter = options->OnionRouter;
|
|
|
|
free_options(options);
|
|
|
|
}
|
2003-10-21 11:48:17 +02: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);
|
|
|
|
}
|
|
|
|
|
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];
|
2003-10-15 09:19:38 +02:00
|
|
|
} else { /* didn't find one, try CONFDIR */
|
|
|
|
fname = CONFDIR "/torrc";
|
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) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log(LOG_WARN, "Unable to open configuration 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
|
|
|
return -1;
|
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
|
|
|
|
|
|
|
cl = config_get_lines(cf);
|
2003-09-29 09:50:08 +02:00
|
|
|
if(!cl) return -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
|
|
|
config_assign(options,cl);
|
|
|
|
config_free_lines(cl);
|
|
|
|
config_close(cf);
|
2002-11-23 07:49:01 +01:00
|
|
|
|
|
|
|
/* go through command-line variables too */
|
|
|
|
cl = config_get_commandlines(argc,argv);
|
|
|
|
config_assign(options,cl);
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
if(previous_onionrouter >= 0 && previous_onionrouter != options->OnionRouter) {
|
|
|
|
log_fn(LOG_WARN,"During reload, OnionRouter changed from %d to %d. Failing.",
|
|
|
|
previous_onionrouter, options->OnionRouter);
|
|
|
|
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;
|
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 {
|
2003-10-10 03:48:32 +02:00
|
|
|
log(LOG_WARN,"LogLevel must be one of err|warn|info|debug.");
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(options->RouterFile == NULL) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log(LOG_WARN,"RouterFile option required, but not found.");
|
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-05-28 04:03:25 +02:00
|
|
|
if(options->OnionRouter && options->ORPort == 0) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log(LOG_WARN,"If OnionRouter is set, then ORPort must be positive.");
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2003-09-25 07:17:11 +02:00
|
|
|
if(options->OnionRouter && options->DataDirectory == NULL) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log(LOG_WARN,"DataDirectory option required for OnionRouter, but not found.");
|
2003-05-08 00:40:03 +02:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2003-09-08 08:26:38 +02:00
|
|
|
if(options->OnionRouter && options->Nickname == NULL) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log_fn(LOG_WARN,"Nickname required for OnionRouter, but not found.");
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
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-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;
|
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
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:
|
|
|
|
*/
|