config.c 18.5 KB
Newer Older
1
/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
2
3
4
/* See LICENSE for licensing information */
/* $Id$ */

Roger Dingledine's avatar
Roger Dingledine committed
5
#include "or.h"
Roger Dingledine's avatar
Roger Dingledine committed
6

7
8
9
10
11
12
13
14
/* 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

15
#define CONFIG_LINE_MAXLEN 4096
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30

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);

31
/* open configuration file for reading */
32
static FILE *config_open(const unsigned char *filename) {
33
34
35
36
37
38
39
40
41
  assert(filename);
  if (strspn(filename,CONFIG_LEGAL_FILENAME_CHARACTERS) != strlen(filename)) {
    /* filename has illegal letters */
    return NULL;
  }
  return fopen(filename, "r");
}

/* close configuration file */
42
static int config_close(FILE *f) {
43
44
45
46
  assert(f);
  return fclose(f);
}

47
static struct config_line *config_get_commandlines(int argc, char **argv) {
48
49
50
51
52
  struct config_line *new;
  struct config_line *front = NULL;
  char *s;
  int i = 1;

Roger Dingledine's avatar
Roger Dingledine committed
53
  while(i < argc-1) {
54
55
56
57
58
59
    if(!strcmp(argv[i],"-f")) {
//      log(LOG_DEBUG,"Commandline: skipping over -f.");
      i+=2; /* this is the config file option. ignore it. */
      continue;
    }

60
    new = tor_malloc(sizeof(struct config_line));
61
62
63
    s = argv[i];
    while(*s == '-')
      s++;
64
65
    new->key = tor_strdup(s);
    new->value = tor_strdup(argv[i+1]);
66
67
68
69
70
71
72
73
74
75

    log(LOG_DEBUG,"Commandline: parsed keyword '%s', value '%s'",
      new->key, new->value);
    new->next = front;
    front = new;
    i += 2;
  }
  return front;
}

76
77
/* parse the config file and strdup into key/value strings. Return list,
 * or NULL if parsing the file failed.
78
 * Warn and ignore mangled lines. */
79
static struct config_line *config_get_lines(FILE *f) {
80
81
82
  struct config_line *new;
  struct config_line *front = NULL;
  char line[CONFIG_LINE_MAXLEN];
83
84
  int result;
  char *key, *value;
85

86
  while( (result=parse_line_from_file(line,sizeof(line),f,&key,&value)) > 0) {
87
    new = tor_malloc(sizeof(struct config_line));
88
89
    new->key = tor_strdup(key);
    new->value = tor_strdup(value);
90
91
92

    new->next = front;
    front = new;
Roger Dingledine's avatar
Roger Dingledine committed
93
  }
94
95
  if(result < 0)
    return NULL;
96
  return front;
Roger Dingledine's avatar
Roger Dingledine committed
97
98
}

99
static void config_free_lines(struct config_line *front) {
100
101
102
103
104
105
106
107
108
109
110
111
  struct config_line *tmp;

  while(front) {
    tmp = front;
    front = tmp->next;

    free(tmp->key);
    free(tmp->value);
    free(tmp);
  }
}

112
static int config_compare(struct config_line *c, char *key, int type, void *arg) {
113
  int i;
114
115
116
117
118

  if(strncasecmp(c->key,key,strlen(c->key)))
    return 0;

  /* it's a match. cast and assign. */
119
  log_fn(LOG_DEBUG,"Recognized keyword '%s' as %s, using value '%s'.",c->key,key,c->value);
120
121

  switch(type) {
Roger Dingledine's avatar
Roger Dingledine committed
122
    case CONFIG_TYPE_INT:
123
      *(int *)arg = atoi(c->value);
124
      break;
125
126
127
    case CONFIG_TYPE_BOOL:
      i = atoi(c->value);
      if (i != 0 && i != 1) {
Roger Dingledine's avatar
Roger Dingledine committed
128
        log(LOG_WARN, "Boolean keyword '%s' expects 0 or 1", c->key);
129
        return 0;
130
131
132
      }
      *(int *)arg = i;
      break;
133
    case CONFIG_TYPE_STRING:
134
      tor_free(*(char **)arg);
135
      *(char **)arg = tor_strdup(c->value);
136
      break;
137
138
    case CONFIG_TYPE_DOUBLE:
      *(double *)arg = atof(c->value);
139
      break;
140
141
142
143
  }
  return 1;
}

144
static void config_assign(or_options_t *options, struct config_line *list) {
145
146
147
148
149
150
151
152
153

  /* 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 */
154
155
    config_compare(list, "Address",        CONFIG_TYPE_STRING, &options->Address) ||

156
157
158
    config_compare(list, "BandwidthRate",  CONFIG_TYPE_INT, &options->BandwidthRate) ||
    config_compare(list, "BandwidthBurst", CONFIG_TYPE_INT, &options->BandwidthBurst) ||

159
    config_compare(list, "DebugLogFile",   CONFIG_TYPE_STRING, &options->DebugLogFile) ||
160
    config_compare(list, "DataDirectory",  CONFIG_TYPE_STRING, &options->DataDirectory) ||
161
162
163
164
    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) ||

165
166
    config_compare(list, "ExitNodes",      CONFIG_TYPE_STRING, &options->ExitNodes) ||
    config_compare(list, "EntryNodes",     CONFIG_TYPE_STRING, &options->EntryNodes) ||
167
    config_compare(list, "ExitPolicy",     CONFIG_TYPE_STRING, &options->ExitPolicy) ||
168
    config_compare(list, "ExcludedNodes",  CONFIG_TYPE_STRING, &options->ExcludedNodes) ||
169

170
    config_compare(list, "Group",          CONFIG_TYPE_STRING, &options->Group) ||
171

172
173
174
175
176
177
178
179
180
    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) ||
181
    config_compare(list, "MaxOnionsPending",CONFIG_TYPE_INT, &options->MaxOnionsPending) ||
182
183

    config_compare(list, "Nickname",       CONFIG_TYPE_STRING, &options->Nickname) ||
184
    config_compare(list, "NewCircuitPeriod",CONFIG_TYPE_INT, &options->NewCircuitPeriod) ||
185
    config_compare(list, "NumCpus",        CONFIG_TYPE_INT, &options->NumCpus) ||
186

187
188
    config_compare(list, "ORPort",         CONFIG_TYPE_INT, &options->ORPort) ||
    config_compare(list, "ORBindAddress",  CONFIG_TYPE_STRING, &options->ORBindAddress) ||
189

190
    config_compare(list, "PidFile",        CONFIG_TYPE_STRING, &options->PidFile) ||
191
    config_compare(list, "PathlenCoinWeight",CONFIG_TYPE_DOUBLE, &options->PathlenCoinWeight) ||
192
193
194

    config_compare(list, "RouterFile",     CONFIG_TYPE_STRING, &options->RouterFile) ||
    config_compare(list, "RunAsDaemon",    CONFIG_TYPE_BOOL, &options->RunAsDaemon) ||
195
    config_compare(list, "RecommendedVersions",CONFIG_TYPE_STRING, &options->RecommendedVersions) ||
196

197
198
199
200
201
202
    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) ||

    config_compare(list, "User",           CONFIG_TYPE_STRING, &options->User)
203
204
205
    ) {
      /* then we're ok. it matched something. */
    } else {
Roger Dingledine's avatar
Roger Dingledine committed
206
      log_fn(LOG_WARN,"Ignoring unknown keyword '%s'.",list->key);
207
208
209
    }

    list = list->next;
Roger Dingledine's avatar
Roger Dingledine committed
210
  }
211
212
}

213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
/* 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"
;

301
302
303
304
305
306
307
308
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;
}

309
310
311
312
313
314
315
316
317
318
/* 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 */
319
  if(config_assign_default_dirservers() < 0)
320
321
322
323
    return -1;
  return 0;
}

324
/* prints the usage of tor. */
325
static void print_usage(void) {
326
  printf("tor -f <torrc> [args]\n"
327
328
         "See man page for more options.\n\n"
         "-b <bandwidth>\t\tbytes/second rate limiting\n"
329
330
         "-d <file>\t\tDebug file\n"
         "-m <max>\t\tMax number of connections\n"
331
332
333
334
         "-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"
335
         "-s <IP>\t\t\tPort to bind to for Socks\n"
336
         );
337
338
  printf("\nServer options:\n"
         "-n <nick>\t\tNickname of router\n"
339
340
341
         "-o <port>\t\tOR port to bind to\n"
         "-p <file>\t\tPID file\n"
         );
342
343
}

344
static void free_options(or_options_t *options) {
345
346
347
348
349
350
351
352
  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);
353
354
  tor_free(options->ExitNodes);
  tor_free(options->EntryNodes);
355
  tor_free(options->ExcludedNodes);
356
  tor_free(options->ExitPolicy);
357
358
  tor_free(options->SocksBindAddress);
  tor_free(options->ORBindAddress);
359
  tor_free(options->DirBindAddress);
360
  tor_free(options->RecommendedVersions);
361
362
  tor_free(options->User);
  tor_free(options->Group);
363
}
364

365
static void init_options(or_options_t *options) {
366
/* give reasonable values for each option. Defaults to zero. */
367
  memset(options,0,sizeof(or_options_t));
368
  options->LogLevel = tor_strdup("warn");
369
370
  options->ExitNodes = tor_strdup("");
  options->EntryNodes = tor_strdup("");
371
  options->ExcludedNodes = tor_strdup("");
372
  options->ExitPolicy = tor_strdup("");
373
374
  options->SocksBindAddress = tor_strdup("127.0.0.1");
  options->ORBindAddress = tor_strdup("0.0.0.0");
375
  options->DirBindAddress = tor_strdup("0.0.0.0");
376
  options->RecommendedVersions = tor_strdup("none");
377
  options->loglevel = LOG_INFO;
378
  options->PidFile = NULL; // tor_strdup("tor.pid");
379
  options->DataDirectory = NULL;
380
  options->PathlenCoinWeight = 0.3;
381
  options->MaxConn = 900;
382
  options->DirFetchPostPeriod = 600;
383
  options->KeepalivePeriod = 300;
384
  options->MaxOnionsPending = 100;
385
  options->NewCircuitPeriod = 30; /* twice a minute */
386
387
  options->BandwidthRate = 800000; /* at most 800kB/s total sustained incoming */
  options->BandwidthBurst = 10000000; /* max burst on the token bucket */
388
  options->NumCpus = 1;
389
390
391
392
393
394
395
396
397
}

/* 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;
398
399
400
401
402
  static int first_load = 1;
  static char **backup_argv;
  static int backup_argc;
  char *previous_pidfile = NULL;
  int previous_runasdaemon = 0;
403
  int using_default_torrc;
404
405
406
407
408
409
410
411
412
413

  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 */
414
415
    if(options->PidFile)
      previous_pidfile = tor_strdup(options->PidFile);
416
417
418
    previous_runasdaemon = options->RunAsDaemon;
    free_options(options);
  }
Roger Dingledine's avatar
Roger Dingledine committed
419
  init_options(options);
420

421
422
423
424
425
  if(argc > 1 && (!strcmp(argv[1], "-h") || !strcmp(argv[1],"--help"))) {
    print_usage();
    exit(0);
  }

426
427
428
429
430
431
/* 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 */
432
    fname = argv[i+1];
433
    using_default_torrc = 0;
434
435
  } else { /* didn't find one, try CONFDIR */
    fname = CONFDIR "/torrc";
436
    using_default_torrc = 1;
437
438
439
440
  }
  log(LOG_DEBUG,"Opening config file '%s'",fname);

  cf = config_open(fname);
441
  if(!cf) {
442
443
444
445
446
447
448
449
450
451
452
453
454
455
    if(using_default_torrc == 1) {
      log(LOG_WARN, "Configuration file '%s' not found. Using defaults.",fname);
      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;
    config_assign(options,cl);
    config_free_lines(cl);
    config_close(cf);
456
  }
457

458
459
460
461
462
463
464
/* go through command-line variables too */
  cl = config_get_commandlines(argc,argv);
  config_assign(options,cl);
  config_free_lines(cl);

/* Validate options */

465
  /* first check if any of the previous options have changed but aren't allowed to */
466
467
468
469
470
471
472
473
474
475
476
477
  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;
  }

478
  if(options->LogLevel) {
479
    if(!strcmp(options->LogLevel,"err"))
480
      options->loglevel = LOG_ERR;
Roger Dingledine's avatar
Roger Dingledine committed
481
482
    else if(!strcmp(options->LogLevel,"warn"))
      options->loglevel = LOG_WARN;
483
484
485
486
487
    else if(!strcmp(options->LogLevel,"info"))
      options->loglevel = LOG_INFO;
    else if(!strcmp(options->LogLevel,"debug"))
      options->loglevel = LOG_DEBUG;
    else {
Roger Dingledine's avatar
Roger Dingledine committed
488
      log(LOG_WARN,"LogLevel must be one of err|warn|info|debug.");
489
490
491
492
      result = -1;
    }
  }

493
  if(options->ORPort < 0) {
Roger Dingledine's avatar
Roger Dingledine committed
494
    log(LOG_WARN,"ORPort option can't be negative.");
495
496
497
    result = -1;
  }

498
499
  if(options->ORPort && options->DataDirectory == NULL) {
    log(LOG_WARN,"DataDirectory option required if ORPort is set, but not found.");
500
501
502
    result = -1;
  }

503
504
  if(options->ORPort && options->Nickname == NULL) {
    log_fn(LOG_WARN,"Nickname required if ORPort is set, but not found.");
505
506
507
    result = -1;
  }

508
509
  if(options->SocksPort < 0) {
    log(LOG_WARN,"SocksPort option can't be negative.");
510
511
512
    result = -1;
  }

513
514
515
  if(options->SocksPort == 0 && options->ORPort == 0) {
    log(LOG_WARN,"SocksPort and ORPort are both undefined? Quitting.");
    result = -1;
Roger Dingledine's avatar
Roger Dingledine committed
516
  }
517

518
  if(options->DirPort < 0) {
Roger Dingledine's avatar
Roger Dingledine committed
519
    log(LOG_WARN,"DirPort option can't be negative.");
520
521
522
    result = -1;
  }

523
  if(options->SocksPort > 1 &&
524
525
     (options->PathlenCoinWeight < 0.0 || options->PathlenCoinWeight >= 1.0)) {
    log(LOG_WARN,"PathlenCoinWeight option must be >=0.0 and <1.0.");
526
527
528
    result = -1;
  }

529
  if(options->MaxConn < 1) {
Roger Dingledine's avatar
Roger Dingledine committed
530
    log(LOG_WARN,"MaxConn option must be a non-zero positive integer.");
531
532
533
534
    result = -1;
  }

  if(options->MaxConn >= MAXCONNECTIONS) {
Roger Dingledine's avatar
Roger Dingledine committed
535
    log(LOG_WARN,"MaxConn option must be less than %d.", MAXCONNECTIONS);
536
537
538
    result = -1;
  }

539
  if(options->DirFetchPostPeriod < 1) {
Roger Dingledine's avatar
Roger Dingledine committed
540
    log(LOG_WARN,"DirFetchPostPeriod option must be positive.");
541
542
543
544
    result = -1;
  }

  if(options->KeepalivePeriod < 1) {
Roger Dingledine's avatar
Roger Dingledine committed
545
    log(LOG_WARN,"KeepalivePeriod option must be positive.");
546
547
548
549
    result = -1;
  }

  return result;
550
551
}

552
553
554
555
556
557
558
/*
  Local Variables:
  mode:c
  indent-tabs-mode:nil
  c-basic-offset:2
  End:
*/