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
|
|
|
/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */
|
|
|
|
/* 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
|
|
|
|
2002-11-23 07:49:01 +01:00
|
|
|
const char *basename(const char *filename) {
|
2002-09-03 20:44:24 +02:00
|
|
|
char *result;
|
|
|
|
/* XXX This won't work on windows. */
|
|
|
|
result = strrchr(filename, '/');
|
|
|
|
if (result)
|
|
|
|
return result;
|
|
|
|
else
|
|
|
|
return filename;
|
|
|
|
}
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2002-11-23 07:49:01 +01:00
|
|
|
/* open configuration file for reading */
|
|
|
|
FILE *config_open(const unsigned char *filename) {
|
|
|
|
assert(filename);
|
|
|
|
if (strspn(filename,CONFIG_LEGAL_FILENAME_CHARACTERS) != strlen(filename)) {
|
|
|
|
/* filename has illegal letters */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return fopen(filename, "r");
|
|
|
|
}
|
|
|
|
|
|
|
|
/* close configuration file */
|
|
|
|
int config_close(FILE *f) {
|
|
|
|
assert(f);
|
|
|
|
return fclose(f);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct config_line *config_get_commandlines(int argc, char **argv) {
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
new = malloc(sizeof(struct config_line));
|
|
|
|
s = argv[i];
|
|
|
|
while(*s == '-')
|
|
|
|
s++;
|
|
|
|
new->key = strdup(s);
|
|
|
|
new->value = strdup(argv[i+1]);
|
|
|
|
|
|
|
|
log(LOG_DEBUG,"Commandline: parsed keyword '%s', value '%s'",
|
|
|
|
new->key, new->value);
|
|
|
|
new->next = front;
|
|
|
|
front = new;
|
|
|
|
i += 2;
|
|
|
|
}
|
|
|
|
return front;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* parse the config file and strdup into key/value strings. Return list.
|
2002-12-03 23:18:23 +01:00
|
|
|
* Warn and ignore mangled lines. */
|
2002-11-23 07:49:01 +01:00
|
|
|
struct config_line *config_get_lines(FILE *f) {
|
|
|
|
struct config_line *new;
|
|
|
|
struct config_line *front = NULL;
|
|
|
|
char line[CONFIG_LINE_MAXLEN];
|
|
|
|
int lineno=0; /* current line number */
|
|
|
|
char *s;
|
|
|
|
char *start, *end;
|
|
|
|
|
|
|
|
assert(f);
|
|
|
|
|
|
|
|
fseek(f,0,SEEK_SET); /* make sure we start at the beginning of file */
|
|
|
|
|
|
|
|
while(fgets(line, CONFIG_LINE_MAXLEN, f)) {
|
|
|
|
lineno++;
|
|
|
|
|
|
|
|
/* first strip comments */
|
|
|
|
s = strchr(line,'#');
|
|
|
|
if(s) {
|
|
|
|
*s = 0; /* stop the line there */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* walk to the end, remove end whitespace */
|
|
|
|
s = index(line, 0); /* now we're at the null */
|
|
|
|
do {
|
|
|
|
*s = 0;
|
|
|
|
s--;
|
|
|
|
} while (isspace(*s));
|
|
|
|
|
|
|
|
start = line;
|
|
|
|
while(isspace(*start))
|
|
|
|
start++;
|
|
|
|
if(*start == 0)
|
|
|
|
continue; /* this line has nothing on it */
|
|
|
|
|
|
|
|
end = start;
|
|
|
|
while(*end && !isspace(*end))
|
|
|
|
end++;
|
|
|
|
s = end;
|
|
|
|
while(*s && isspace(*s))
|
|
|
|
s++;
|
|
|
|
if(!*end || !*s) { /* only a keyword on this line. no value. */
|
|
|
|
log(LOG_WARNING,"Config line %d has keyword '%s' but no value. Skipping.",lineno,s);
|
|
|
|
}
|
|
|
|
*end = 0; /* null it out */
|
|
|
|
|
|
|
|
/* prepare to parse the string into key / value */
|
|
|
|
new = malloc(sizeof(struct config_line));
|
|
|
|
new->key = strdup(start);
|
|
|
|
new->value = strdup(s);
|
|
|
|
|
|
|
|
log(LOG_DEBUG,"Config line %d: parsed keyword '%s', value '%s'",
|
|
|
|
lineno, new->key, new->value);
|
|
|
|
new->next = front;
|
|
|
|
front = new;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2002-11-23 07:49:01 +01:00
|
|
|
return front;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2002-11-23 07:49:01 +01:00
|
|
|
void config_free_lines(struct config_line *front) {
|
|
|
|
struct config_line *tmp;
|
|
|
|
|
|
|
|
while(front) {
|
|
|
|
tmp = front;
|
|
|
|
front = tmp->next;
|
|
|
|
|
|
|
|
free(tmp->key);
|
|
|
|
free(tmp->value);
|
|
|
|
free(tmp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
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. */
|
|
|
|
log(LOG_DEBUG,"config_compare(): Recognized keyword '%s' as %s, using value '%s'.",c->key,key,c->value);
|
|
|
|
|
|
|
|
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-03-18 02:49:55 +01:00
|
|
|
log(LOG_ERR, "Boolean keyword '%s' expects 0 or 1", c->key);
|
|
|
|
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:
|
|
|
|
*(char **)arg = 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;
|
|
|
|
}
|
|
|
|
|
|
|
|
void config_assign(or_options_t *options, struct config_line *list) {
|
|
|
|
|
|
|
|
/* 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 */
|
|
|
|
config_compare(list, "LogLevel", CONFIG_TYPE_STRING, &options->LogLevel) ||
|
|
|
|
config_compare(list, "PrivateKeyFile", CONFIG_TYPE_STRING, &options->PrivateKeyFile) ||
|
|
|
|
config_compare(list, "RouterFile", CONFIG_TYPE_STRING, &options->RouterFile) ||
|
|
|
|
|
|
|
|
/* int options */
|
|
|
|
config_compare(list, "MaxConn", CONFIG_TYPE_INT, &options->MaxConn) ||
|
|
|
|
config_compare(list, "APPort", CONFIG_TYPE_INT, &options->APPort) ||
|
|
|
|
config_compare(list, "OPPort", CONFIG_TYPE_INT, &options->OPPort) ||
|
|
|
|
config_compare(list, "ORPort", CONFIG_TYPE_INT, &options->ORPort) ||
|
|
|
|
config_compare(list, "DirPort", CONFIG_TYPE_INT, &options->DirPort) ||
|
|
|
|
config_compare(list, "DirFetchPeriod", CONFIG_TYPE_INT, &options->DirFetchPeriod) ||
|
|
|
|
config_compare(list, "KeepalivePeriod", CONFIG_TYPE_INT, &options->KeepalivePeriod) ||
|
2002-11-27 05:08:20 +01:00
|
|
|
config_compare(list, "MaxOnionsPending",CONFIG_TYPE_INT, &options->MaxOnionsPending) ||
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2003-03-17 03:27:19 +01:00
|
|
|
config_compare(list, "Daemon", CONFIG_TYPE_BOOL, &options->Daemon) ||
|
|
|
|
config_compare(list, "TrafficShaping", CONFIG_TYPE_BOOL, &options->TrafficShaping) ||
|
|
|
|
config_compare(list, "LinkPadding", CONFIG_TYPE_BOOL, &options->LinkPadding) ||
|
|
|
|
|
2002-11-23 07:49:01 +01:00
|
|
|
/* float options */
|
|
|
|
config_compare(list, "CoinWeight", CONFIG_TYPE_DOUBLE, &options->CoinWeight)
|
|
|
|
|
|
|
|
) {
|
|
|
|
/* then we're ok. it matched something. */
|
|
|
|
} else {
|
|
|
|
log(LOG_WARNING,"config_assign(): Ignoring unknown keyword '%s'.",list->key);
|
|
|
|
}
|
|
|
|
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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[256];
|
|
|
|
int i;
|
|
|
|
const char *cmd;
|
|
|
|
int result = 0;
|
|
|
|
|
|
|
|
/* give reasonable defaults for each option */
|
|
|
|
memset(options,0,sizeof(or_options_t));
|
2003-03-17 03:27:19 +01:00
|
|
|
options->Daemon = 0;
|
2002-11-23 07:49:01 +01:00
|
|
|
options->LogLevel = "debug";
|
|
|
|
options->loglevel = LOG_DEBUG;
|
|
|
|
options->CoinWeight = 0.8;
|
|
|
|
options->LinkPadding = 0;
|
major overhaul: dns slave subsystem, topics
on startup, it forks off a master dns handler, which forks off dns
slaves (like the apache model). slaves as spawned as load increases,
and then reused. excess slaves are not ever killed, currently.
implemented topics. each topic has a receive window in each direction
at each edge of the circuit, and sends sendme's at the data level, as
per before. each circuit also has receive windows in each direction at
each hop; an edge sends a circuit-level sendme as soon as enough data
cells have arrived (regardless of whether the data cells were flushed
to the exit conns). removed the 'connected' cell type, since it's now
a topic command within data cells.
at the edge of the circuit, there can be multiple connections associated
with a single circuit. you find them via the linked list conn->next_topic.
currently each new ap connection starts its own circuit, so we ought
to see comparable performance to what we had before. but that's only
because i haven't written the code to reattach to old circuits. please
try to break it as-is, and then i'll make it reuse the same circuit and
we'll try to break that.
svn:r152
2003-01-26 10:02:24 +01:00
|
|
|
options->DirFetchPeriod = 600;
|
2002-11-23 07:49:01 +01:00
|
|
|
options->KeepalivePeriod = 300;
|
2002-11-27 05:08:20 +01:00
|
|
|
options->MaxOnionsPending = 10;
|
2002-11-23 07:49:01 +01:00
|
|
|
// options->ReconnectPeriod = 6001;
|
|
|
|
|
|
|
|
/* get config lines from /etc/torrc and assign them */
|
|
|
|
cmd = basename(argv[0]);
|
|
|
|
snprintf(fname,256,"/etc/%src",cmd);
|
|
|
|
|
|
|
|
cf = config_open(fname);
|
|
|
|
if(cf) {
|
|
|
|
/* we got it open. pull out the config lines. */
|
|
|
|
cl = config_get_lines(cf);
|
|
|
|
config_assign(options,cl);
|
|
|
|
config_free_lines(cl);
|
|
|
|
config_close(cf);
|
|
|
|
}
|
|
|
|
/* if we failed to open it, ignore */
|
|
|
|
|
|
|
|
/* learn config file name, get config lines, assign them */
|
|
|
|
i = 1;
|
|
|
|
while(i < argc-1 && strcmp(argv[i],"-f")) {
|
|
|
|
// log(LOG_DEBUG,"examining arg %d (%s), it's not -f.",i,argv[i]);
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
if(i < argc-1) { /* we found one */
|
|
|
|
log(LOG_DEBUG,"Opening specified config file '%s'",argv[i+1]);
|
|
|
|
cf = config_open(argv[i+1]);
|
|
|
|
if(!cf) { /* it's defined but not there. that's no good. */
|
|
|
|
log(LOG_ERR, "Unable to open configuration file '%s'.",argv[i+1]);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
cl = config_get_lines(cf);
|
|
|
|
config_assign(options,cl);
|
|
|
|
config_free_lines(cl);
|
|
|
|
config_close(cf);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* go through command-line variables too */
|
|
|
|
cl = config_get_commandlines(argc,argv);
|
|
|
|
config_assign(options,cl);
|
|
|
|
config_free_lines(cl);
|
|
|
|
|
|
|
|
/* print config */
|
|
|
|
if (options->loglevel == LOG_DEBUG) {
|
2003-03-18 02:49:55 +01:00
|
|
|
printf("LogLevel=%s\n",
|
|
|
|
options->LogLevel);
|
2002-11-23 07:49:01 +01:00
|
|
|
printf("RouterFile=%s, PrivateKeyFile=%s\n",
|
|
|
|
options->RouterFile ? options->RouterFile : "(undefined)",
|
|
|
|
options->PrivateKeyFile ? options->PrivateKeyFile : "(undefined)");
|
|
|
|
printf("ORPort=%d, OPPort=%d, APPort=%d DirPort=%d\n",
|
|
|
|
options->ORPort,options->OPPort,
|
|
|
|
options->APPort,options->DirPort);
|
|
|
|
printf("CoinWeight=%6.4f, MaxConn=%d, TrafficShaping=%d, LinkPadding=%d\n",
|
|
|
|
options->CoinWeight,
|
|
|
|
options->MaxConn,
|
|
|
|
options->TrafficShaping,
|
|
|
|
options->LinkPadding);
|
2003-03-18 02:49:55 +01:00
|
|
|
printf("DirFetchPeriod=%d KeepalivePeriod=%d\n",
|
2002-11-23 07:49:01 +01:00
|
|
|
options->DirFetchPeriod,
|
|
|
|
options->KeepalivePeriod);
|
2003-03-19 23:02:35 +01:00
|
|
|
printf("Daemon=%d\n", options->Daemon);
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Validate options */
|
|
|
|
|
|
|
|
if(options->LogLevel) {
|
|
|
|
if(!strcmp(options->LogLevel,"emerg"))
|
|
|
|
options->loglevel = LOG_EMERG;
|
|
|
|
else if(!strcmp(options->LogLevel,"alert"))
|
|
|
|
options->loglevel = LOG_ALERT;
|
|
|
|
else if(!strcmp(options->LogLevel,"crit"))
|
|
|
|
options->loglevel = LOG_CRIT;
|
|
|
|
else if(!strcmp(options->LogLevel,"err"))
|
|
|
|
options->loglevel = LOG_ERR;
|
|
|
|
else if(!strcmp(options->LogLevel,"warning"))
|
|
|
|
options->loglevel = LOG_WARNING;
|
|
|
|
else if(!strcmp(options->LogLevel,"notice"))
|
|
|
|
options->loglevel = LOG_NOTICE;
|
|
|
|
else if(!strcmp(options->LogLevel,"info"))
|
|
|
|
options->loglevel = LOG_INFO;
|
|
|
|
else if(!strcmp(options->LogLevel,"debug"))
|
|
|
|
options->loglevel = LOG_DEBUG;
|
|
|
|
else {
|
|
|
|
log(LOG_ERR,"LogLevel must be one of emerg|alert|crit|err|warning|notice|info|debug.");
|
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(options->RouterFile == NULL) {
|
|
|
|
log(LOG_ERR,"RouterFile option required, but not found.");
|
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2003-03-18 02:49:55 +01:00
|
|
|
if(options->ORPort < 0) {
|
|
|
|
log(LOG_ERR,"ORPort option required and must be a positive integer value.");
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2003-03-18 02:49:55 +01:00
|
|
|
if(options->ORPort > 0 && options->PrivateKeyFile == NULL) {
|
|
|
|
log(LOG_ERR,"PrivateKeyFile option required for OR, but not found.");
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2003-03-18 02:49:55 +01:00
|
|
|
if(options->OPPort < 0) {
|
|
|
|
log(LOG_ERR,"OPPort option can't be negative.");
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2003-03-18 02:49:55 +01:00
|
|
|
if(options->APPort < 0) {
|
|
|
|
log(LOG_ERR,"APPort option can't be negative.");
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2003-03-18 02:49:55 +01:00
|
|
|
if(options->DirPort < 0) {
|
|
|
|
log(LOG_ERR,"DirPort option can't be negative.");
|
2002-11-23 07:49:01 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2003-03-18 02:49:55 +01:00
|
|
|
if(options->APPort > 1 &&
|
2002-11-23 07:49:01 +01:00
|
|
|
(options->CoinWeight < 0.0 || options->CoinWeight >= 1.0)) {
|
2003-03-18 02:49:55 +01:00
|
|
|
log(LOG_ERR,"CoinWeight 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) {
|
2002-11-23 07:49:01 +01:00
|
|
|
log(LOG_ERR,"MaxConn option must be a non-zero positive integer.");
|
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(options->MaxConn >= MAXCONNECTIONS) {
|
|
|
|
log(LOG_ERR,"MaxConn option must be less than %d.", MAXCONNECTIONS);
|
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(options->DirFetchPeriod < 1) {
|
|
|
|
log(LOG_ERR,"DirFetchPeriod option must be positive.");
|
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(options->KeepalivePeriod < 1) {
|
|
|
|
log(LOG_ERR,"KeepalivePeriod option must be positive.");
|
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
2002-07-03 18:31:22 +02:00
|
|
|
}
|
|
|
|
|