|
|
@@ -2,22 +2,9 @@
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
- * config.c
|
|
|
- * Routines for loading the configuration file.
|
|
|
- *
|
|
|
- * Matej Pfajfar <mp292@cam.ac.uk>
|
|
|
- */
|
|
|
-
|
|
|
#include "or.h"
|
|
|
|
|
|
-#ifndef POPT_TABLEEND
|
|
|
-#define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL }
|
|
|
-#endif
|
|
|
-
|
|
|
-const char *
|
|
|
-basename(const char *filename)
|
|
|
-{
|
|
|
+const char *basename(const char *filename) {
|
|
|
char *result;
|
|
|
|
|
|
result = strrchr(filename, '/');
|
|
|
@@ -27,279 +14,369 @@ basename(const char *filename)
|
|
|
return filename;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-int getconfig(char *conf_filename, config_opt_t *options)
|
|
|
-{
|
|
|
- FILE *cf = NULL;
|
|
|
- int retval = 0;
|
|
|
-
|
|
|
- if ((!conf_filename) || (!options))
|
|
|
- return -1;
|
|
|
-
|
|
|
-
|
|
|
- cf = open_config(conf_filename);
|
|
|
- if (!cf)
|
|
|
- {
|
|
|
- log(LOG_ERR,"Could not open configuration file %s.",conf_filename);
|
|
|
- return -1;
|
|
|
+
|
|
|
+FILE *config_open(const unsigned char *filename) {
|
|
|
+ assert(filename);
|
|
|
+ if (strspn(filename,CONFIG_LEGAL_FILENAME_CHARACTERS) != strlen(filename)) {
|
|
|
+
|
|
|
+ return NULL;
|
|
|
+ }
|
|
|
+ return fopen(filename, "r");
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
+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")) {
|
|
|
+
|
|
|
+ i+=2;
|
|
|
+ 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;
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
+ * * Warn and ignore mangled lines. */
|
|
|
+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;
|
|
|
+ char *s;
|
|
|
+ char *start, *end;
|
|
|
+
|
|
|
+ assert(f);
|
|
|
+
|
|
|
+ fseek(f,0,SEEK_SET);
|
|
|
+
|
|
|
+ while(fgets(line, CONFIG_LINE_MAXLEN, f)) {
|
|
|
+ lineno++;
|
|
|
+
|
|
|
+
|
|
|
+ s = strchr(line,'#');
|
|
|
+ if(s) {
|
|
|
+ *s = 0;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ s = index(line, 0);
|
|
|
+ do {
|
|
|
+ *s = 0;
|
|
|
+ s--;
|
|
|
+ } while (isspace(*s));
|
|
|
+
|
|
|
+ start = line;
|
|
|
+ while(isspace(*start))
|
|
|
+ start++;
|
|
|
+ if(*start == 0)
|
|
|
+ continue;
|
|
|
+
|
|
|
+ end = start;
|
|
|
+ while(*end && !isspace(*end))
|
|
|
+ end++;
|
|
|
+ s = end;
|
|
|
+ while(*s && isspace(*s))
|
|
|
+ s++;
|
|
|
+ if(!*end || !*s) {
|
|
|
+ log(LOG_WARNING,"Config line %d has keyword '%s' but no value. Skipping.",lineno,s);
|
|
|
+ }
|
|
|
+ *end = 0;
|
|
|
+
|
|
|
+
|
|
|
+ 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;
|
|
|
}
|
|
|
- retval = parse_config(cf,options);
|
|
|
- if (retval)
|
|
|
- return -1;
|
|
|
|
|
|
- return 0;
|
|
|
+ return front;
|
|
|
}
|
|
|
|
|
|
-int getoptions(int argc, char **argv, or_options_t *options)
|
|
|
-
|
|
|
-
|
|
|
-A replacement for getargs() and getconfig() which uses the <popt> library to parse
|
|
|
-both command-line arguments and configuration files. A specific configuration file
|
|
|
-may be specified using the --ConfigFile option. If one is not specified, then the
|
|
|
-configuration files at /etc/<cmd>rc and ~/.<cmd>rc will be loaded in that order so
|
|
|
-user preferences will override the ones specified in /etc.
|
|
|
-
|
|
|
-The --ConfigFile (-f) option may only be used on the command-line. All other command-line
|
|
|
-options may also be specified in configuration files. <popt> aliases are enabled
|
|
|
-so a user can define their own options in the /etc/popt or ~/.popt files as outlined
|
|
|
-in "man popt" pages.
|
|
|
-
|
|
|
-RETURN VALUE: 0 on success, non-zero on error
|
|
|
-**/
|
|
|
-{
|
|
|
- char *ConfigFile;
|
|
|
- int Verbose;
|
|
|
- int code;
|
|
|
- poptContext optCon;
|
|
|
- const char *cmd;
|
|
|
- struct poptOption opt_tab[] =
|
|
|
- {
|
|
|
- { "APPort", 'a', POPT_ARG_INT, &options->APPort,
|
|
|
- 0, "application proxy port", "<port>" },
|
|
|
- { "CoinWeight", 'w', POPT_ARG_FLOAT, &options->CoinWeight,
|
|
|
- 0, "coin weight used in determining routes", "<weight>" },
|
|
|
- { "ConfigFile", 'f', POPT_ARG_STRING, &ConfigFile,
|
|
|
- 0, "user specified configuration file", "<file>" },
|
|
|
- { "LogLevel", 'l', POPT_ARG_STRING, &options->LogLevel,
|
|
|
- 0, "emerg|alert|crit|err|warning|notice|info|debug", "<level>" },
|
|
|
- { "MaxConn", 'm', POPT_ARG_INT, &options->MaxConn,
|
|
|
- 0, "maximum number of incoming connections", "<max>" },
|
|
|
- { "OPPort", 'o', POPT_ARG_INT, &options->OPPort,
|
|
|
- 0, "onion proxy port", "<port>" },
|
|
|
- { "ORPort", 'p', POPT_ARG_INT, &options->ORPort,
|
|
|
- 0, "onion router port", "<port>" },
|
|
|
- { "DirPort", 'd', POPT_ARG_INT, &options->DirPort,
|
|
|
- 0, "directory server port", "<port>" },
|
|
|
- { "PrivateKeyFile", 'k', POPT_ARG_STRING, &options->PrivateKeyFile,
|
|
|
- 0, "maximum number of incoming connections", "<file>" },
|
|
|
- { "RouterFile", 'r', POPT_ARG_STRING, &options->RouterFile,
|
|
|
- 0, "local port on which the onion proxy is running", "<file>" },
|
|
|
- { "TrafficShaping", 't', POPT_ARG_INT, &options->TrafficShaping,
|
|
|
- 0, "which traffic shaping policy to use", "<policy>" },
|
|
|
- { "LinkPadding", 'P', POPT_ARG_INT, &options->LinkPadding,
|
|
|
- 0, "whether to use link padding", "<padding>" },
|
|
|
- { "DirRebuildPeriod",'D', POPT_ARG_INT, &options->DirRebuildPeriod,
|
|
|
- 0, "how many seconds between directory rebuilds", "<rebuildperiod>" },
|
|
|
- { "DirFetchPeriod", 'F', POPT_ARG_INT, &options->DirFetchPeriod,
|
|
|
- 0, "how many seconds between directory fetches", "<fetchperiod>" },
|
|
|
- { "KeepalivePeriod", 'K', POPT_ARG_INT, &options->KeepalivePeriod,
|
|
|
- 0, "how many seconds between keepalives", "<keepaliveperiod>" },
|
|
|
-
|
|
|
-
|
|
|
- { "Role", 'R', POPT_ARG_INT, &options->Role,
|
|
|
- 0, "4-bit global role id", "<role>" },
|
|
|
- { "Verbose", 'v', POPT_ARG_NONE, &Verbose,
|
|
|
- 0, "display options selected before execution", NULL },
|
|
|
- POPT_AUTOHELP
|
|
|
- POPT_TABLEEND
|
|
|
- };
|
|
|
- cmd = basename(argv[0]);
|
|
|
- optCon = poptGetContext(cmd,argc,(const char **)argv,opt_tab,0);
|
|
|
-
|
|
|
- poptReadDefaultConfig(optCon,0);
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- bzero(options,sizeof(or_options_t));
|
|
|
- options->LogLevel = "debug";
|
|
|
- options->loglevel = LOG_DEBUG;
|
|
|
- options->CoinWeight = 0.8;
|
|
|
- options->LinkPadding = 0;
|
|
|
- options->DirRebuildPeriod = 600;
|
|
|
- options->DirFetchPeriod = 6000;
|
|
|
- options->KeepalivePeriod = 300;
|
|
|
-
|
|
|
- options->Role = ROLE_OR_LISTEN | ROLE_OR_CONNECT_ALL | ROLE_OP_LISTEN | ROLE_AP_LISTEN;
|
|
|
-
|
|
|
- code = poptGetNextOpt(optCon);
|
|
|
- if ( code == -1 )
|
|
|
- {
|
|
|
- if ( ConfigFile )
|
|
|
- code = poptReadOptions(optCon,ConfigFile);
|
|
|
- else
|
|
|
- code = poptReadDefaultOptions(cmd,optCon);
|
|
|
- }
|
|
|
-
|
|
|
- switch(code)
|
|
|
- {
|
|
|
- case INT_MIN:
|
|
|
- log(LOG_ERR, "%s: Unable to open configuration file.\n", ConfigFile);
|
|
|
+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) {
|
|
|
+
|
|
|
+ if(strncasecmp(c->key,key,strlen(c->key)))
|
|
|
+ return 0;
|
|
|
+
|
|
|
+
|
|
|
+ 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);
|
|
|
break;
|
|
|
- case -1:
|
|
|
- code = 0;
|
|
|
+ case CONFIG_TYPE_STRING:
|
|
|
+ *(char **)arg = strdup(c->value);
|
|
|
break;
|
|
|
- default:
|
|
|
- poptPrintUsage(optCon, stderr, 0);
|
|
|
- log(LOG_ERR, "%s: %s\n", poptBadOption(optCon, POPT_BADOPTION_NOALIAS), poptStrerror(code));
|
|
|
+ case CONFIG_TYPE_DOUBLE:
|
|
|
+ *(double *)arg = atof(c->value);
|
|
|
break;
|
|
|
- }
|
|
|
-
|
|
|
- poptFreeContext(optCon);
|
|
|
-
|
|
|
- if ( code ) return code;
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- if ( Verbose )
|
|
|
- {
|
|
|
- printf("LogLevel=%s, Role=%d\n",
|
|
|
- options->LogLevel,
|
|
|
- options->Role);
|
|
|
- printf("RouterFile=%s, PrivateKeyFile=%s\n",
|
|
|
- options->RouterFile,
|
|
|
- options->PrivateKeyFile);
|
|
|
- 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);
|
|
|
- printf("DirRebuildPeriod=%d, DirFetchPeriod=%d KeepalivePeriod=%d\n",
|
|
|
- options->DirRebuildPeriod,
|
|
|
- options->DirFetchPeriod,
|
|
|
- options->KeepalivePeriod);
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- 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.");
|
|
|
- code = -1;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if ( options->Role < 0 || options->Role > 63 )
|
|
|
- {
|
|
|
- log(LOG_ERR,"Role option must be an integer between 0 and 63 (inclusive).");
|
|
|
- code = -1;
|
|
|
- }
|
|
|
-
|
|
|
- if ( options->RouterFile == NULL )
|
|
|
- {
|
|
|
- log(LOG_ERR,"RouterFile option required, but not found.");
|
|
|
- code = -1;
|
|
|
- }
|
|
|
-
|
|
|
- if ( ROLE_IS_OR(options->Role) && options->PrivateKeyFile == NULL )
|
|
|
- {
|
|
|
- log(LOG_ERR,"PrivateKeyFile option required for OR, but not found.");
|
|
|
- code = -1;
|
|
|
- }
|
|
|
-
|
|
|
- if ( (options->Role & ROLE_OR_LISTEN) && options->ORPort < 1 )
|
|
|
- {
|
|
|
- log(LOG_ERR,"ORPort option required and must be a positive integer value.");
|
|
|
- code = -1;
|
|
|
- }
|
|
|
-
|
|
|
- if ( (options->Role & ROLE_OP_LISTEN) && options->OPPort < 1 )
|
|
|
- {
|
|
|
- log(LOG_ERR,"OPPort option required and must be a positive integer value.");
|
|
|
- code = -1;
|
|
|
- }
|
|
|
-
|
|
|
- if ( (options->Role & ROLE_AP_LISTEN) && options->APPort < 1 )
|
|
|
- {
|
|
|
- log(LOG_ERR,"APPort option required and must be a positive integer value.");
|
|
|
- code = -1;
|
|
|
- }
|
|
|
-
|
|
|
- if ( (options->Role & ROLE_DIR_LISTEN) && options->DirPort < 1 )
|
|
|
- {
|
|
|
- log(LOG_ERR,"DirPort option required and must be a positive integer value.");
|
|
|
- code = -1;
|
|
|
- }
|
|
|
-
|
|
|
- if ( (options->Role & ROLE_AP_LISTEN) &&
|
|
|
- (options->CoinWeight < 0.0 || options->CoinWeight >= 1.0) )
|
|
|
- {
|
|
|
- log(LOG_ERR,"CoinWeight option must be a value from 0.0 upto 1.0, but not including 1.0.");
|
|
|
- code = -1;
|
|
|
- }
|
|
|
-
|
|
|
- if ( options->MaxConn <= 0 )
|
|
|
- {
|
|
|
- log(LOG_ERR,"MaxConn option must be a non-zero positive integer.");
|
|
|
- code = -1;
|
|
|
- }
|
|
|
-
|
|
|
- if ( options->MaxConn >= MAXCONNECTIONS )
|
|
|
- {
|
|
|
- log(LOG_ERR,"MaxConn option must be less than %d.", MAXCONNECTIONS);
|
|
|
- code = -1;
|
|
|
- }
|
|
|
-
|
|
|
- if ( options->TrafficShaping != 0 && options->TrafficShaping != 1 )
|
|
|
- {
|
|
|
- log(LOG_ERR,"TrafficShaping option must be either 0 or 1.");
|
|
|
- code = -1;
|
|
|
- }
|
|
|
-
|
|
|
- if ( options->LinkPadding != 0 && options->LinkPadding != 1 )
|
|
|
- {
|
|
|
- log(LOG_ERR,"LinkPadding option must be either 0 or 1.");
|
|
|
- code = -1;
|
|
|
- }
|
|
|
-
|
|
|
- if ( options->DirRebuildPeriod < 1)
|
|
|
- {
|
|
|
- log(LOG_ERR,"DirRebuildPeriod option must be positive.");
|
|
|
- code = -1;
|
|
|
- }
|
|
|
-
|
|
|
- if ( options->DirFetchPeriod < 1)
|
|
|
- {
|
|
|
- log(LOG_ERR,"DirFetchPeriod option must be positive.");
|
|
|
- code = -1;
|
|
|
- }
|
|
|
-
|
|
|
- if ( options->KeepalivePeriod < 1)
|
|
|
- {
|
|
|
- log(LOG_ERR,"KeepalivePeriod option must be positive.");
|
|
|
- code = -1;
|
|
|
- }
|
|
|
-
|
|
|
- return code;
|
|
|
+ }
|
|
|
+ return 1;
|
|
|
+}
|
|
|
+
|
|
|
+void config_assign(or_options_t *options, struct config_line *list) {
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ while(list) {
|
|
|
+ if(
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ 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) ||
|
|
|
+
|
|
|
+
|
|
|
+ config_compare(list, "Role", CONFIG_TYPE_INT, &options->Role) ||
|
|
|
+ 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, "TrafficShaping", CONFIG_TYPE_INT, &options->TrafficShaping) ||
|
|
|
+ config_compare(list, "LinkPadding", CONFIG_TYPE_INT, &options->LinkPadding) ||
|
|
|
+ config_compare(list, "DirRebuildPeriod",CONFIG_TYPE_INT, &options->DirRebuildPeriod) ||
|
|
|
+ config_compare(list, "DirFetchPeriod", CONFIG_TYPE_INT, &options->DirFetchPeriod) ||
|
|
|
+ config_compare(list, "KeepalivePeriod", CONFIG_TYPE_INT, &options->KeepalivePeriod) ||
|
|
|
+
|
|
|
+
|
|
|
+ config_compare(list, "CoinWeight", CONFIG_TYPE_DOUBLE, &options->CoinWeight)
|
|
|
+
|
|
|
+ ) {
|
|
|
+
|
|
|
+ } else {
|
|
|
+ log(LOG_WARNING,"config_assign(): Ignoring unknown keyword '%s'.",list->key);
|
|
|
+ }
|
|
|
+
|
|
|
+ list = list->next;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
+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;
|
|
|
+
|
|
|
+
|
|
|
+ memset(options,0,sizeof(or_options_t));
|
|
|
+ options->LogLevel = "debug";
|
|
|
+ options->loglevel = LOG_DEBUG;
|
|
|
+ options->CoinWeight = 0.8;
|
|
|
+ options->LinkPadding = 0;
|
|
|
+ options->DirRebuildPeriod = 600;
|
|
|
+ options->DirFetchPeriod = 6000;
|
|
|
+ options->KeepalivePeriod = 300;
|
|
|
+
|
|
|
+ options->Role = ROLE_OR_LISTEN | ROLE_OR_CONNECT_ALL | ROLE_OP_LISTEN | ROLE_AP_LISTEN;
|
|
|
+
|
|
|
+
|
|
|
+ cmd = basename(argv[0]);
|
|
|
+ snprintf(fname,256,"/etc/%src",cmd);
|
|
|
+
|
|
|
+ cf = config_open(fname);
|
|
|
+ if(cf) {
|
|
|
+
|
|
|
+ cl = config_get_lines(cf);
|
|
|
+ config_assign(options,cl);
|
|
|
+ config_free_lines(cl);
|
|
|
+ config_close(cf);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ i = 1;
|
|
|
+ while(i < argc-1 && strcmp(argv[i],"-f")) {
|
|
|
+
|
|
|
+ i++;
|
|
|
+ }
|
|
|
+ if(i < argc-1) {
|
|
|
+ log(LOG_DEBUG,"Opening specified config file '%s'",argv[i+1]);
|
|
|
+ cf = config_open(argv[i+1]);
|
|
|
+ if(!cf) {
|
|
|
+ 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);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ cl = config_get_commandlines(argc,argv);
|
|
|
+ config_assign(options,cl);
|
|
|
+ config_free_lines(cl);
|
|
|
+
|
|
|
+
|
|
|
+ if (options->loglevel == LOG_DEBUG) {
|
|
|
+ printf("LogLevel=%s, Role=%d\n",
|
|
|
+ options->LogLevel,
|
|
|
+ options->Role);
|
|
|
+ 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);
|
|
|
+ printf("DirRebuildPeriod=%d, DirFetchPeriod=%d KeepalivePeriod=%d\n",
|
|
|
+ options->DirRebuildPeriod,
|
|
|
+ options->DirFetchPeriod,
|
|
|
+ options->KeepalivePeriod);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ 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->Role < 0 || options->Role > 63) {
|
|
|
+ log(LOG_ERR,"Role option must be an integer between 0 and 63 (inclusive).");
|
|
|
+ result = -1;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(options->RouterFile == NULL) {
|
|
|
+ log(LOG_ERR,"RouterFile option required, but not found.");
|
|
|
+ result = -1;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(ROLE_IS_OR(options->Role) && options->PrivateKeyFile == NULL) {
|
|
|
+ log(LOG_ERR,"PrivateKeyFile option required for OR, but not found.");
|
|
|
+ result = -1;
|
|
|
+ }
|
|
|
+
|
|
|
+ if((options->Role & ROLE_OR_LISTEN) && options->ORPort < 1) {
|
|
|
+ log(LOG_ERR,"ORPort option required and must be a positive integer value.");
|
|
|
+ result = -1;
|
|
|
+ }
|
|
|
+
|
|
|
+ if((options->Role & ROLE_OP_LISTEN) && options->OPPort < 1) {
|
|
|
+ log(LOG_ERR,"OPPort option required and must be a positive integer value.");
|
|
|
+ result = -1;
|
|
|
+ }
|
|
|
+
|
|
|
+ if((options->Role & ROLE_AP_LISTEN) && options->APPort < 1) {
|
|
|
+ log(LOG_ERR,"APPort option required and must be a positive integer value.");
|
|
|
+ result = -1;
|
|
|
+ }
|
|
|
+
|
|
|
+ if((options->Role & ROLE_DIR_LISTEN) && options->DirPort < 1) {
|
|
|
+ log(LOG_ERR,"DirPort option required and must be a positive integer value.");
|
|
|
+ result = -1;
|
|
|
+ }
|
|
|
+
|
|
|
+ if((options->Role & ROLE_AP_LISTEN) &&
|
|
|
+ (options->CoinWeight < 0.0 || options->CoinWeight >= 1.0)) {
|
|
|
+ log(LOG_ERR,"CoinWeight option must be a value from 0.0 upto 1.0, but not including 1.0.");
|
|
|
+ result = -1;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(options->MaxConn <= 0) {
|
|
|
+ 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->TrafficShaping != 0 && options->TrafficShaping != 1) {
|
|
|
+ log(LOG_ERR,"TrafficShaping option must be either 0 or 1.");
|
|
|
+ result = -1;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(options->LinkPadding != 0 && options->LinkPadding != 1) {
|
|
|
+ log(LOG_ERR,"LinkPadding option must be either 0 or 1.");
|
|
|
+ result = -1;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(options->DirRebuildPeriod < 1) {
|
|
|
+ log(LOG_ERR,"DirRebuildPeriod option must be positive.");
|
|
|
+ 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;
|
|
|
}
|
|
|
|
Roger Dingledine