[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[or-cvs] remove popt dependency, consolidate config stuff



Update of /home/or/cvsroot/src/or
In directory moria.seul.org:/home/arma/work/onion/cvs/src/or

Modified Files:
	config.c main.c onion.c or.h test_config.c 
Log Message:
remove popt dependency, consolidate config stuff
reformat parts of onion.c


Index: config.c
===================================================================
RCS file: /home/or/cvsroot/src/or/config.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- config.c	3 Oct 2002 02:17:41 -0000	1.20
+++ config.c	23 Nov 2002 06:49:01 -0000	1.21
@@ -2,22 +2,9 @@
 /* See LICENSE for licensing information */
 /* $Id$ */
 
-/**
- * config.c 
- * Routines for loading the configuration file.
- *
- * Matej Pfajfar <mp292@cam.ac.uk>
- */
-
 #include "or.h"
 
-#ifndef POPT_TABLEEND /* handle popt 1.6 before 1.6.2 */
-#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;
   /* XXX This won't work on windows. */
   result = strrchr(filename, '/');
@@ -27,279 +14,369 @@
     return filename;
 }
 
-/* loads the configuration file */
-int getconfig(char *conf_filename, config_opt_t *options)
-{
-  FILE *cf = NULL;
-  int retval = 0;
-  
-  if ((!conf_filename) || (!options))
-    return -1;
-  
-  /* load config file */
-  cf = open_config(conf_filename);
-  if (!cf)
-  {
-    log(LOG_ERR,"Could not open configuration file %s.",conf_filename);
-    return -1;
+/* 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;
   }
-  retval = parse_config(cf,options);
-  if (retval)
-    return -1;
+  return fopen(filename, "r");
+}
 
-  return 0;
+/* close configuration file */
+int config_close(FILE *f) {
+  assert(f);
+  return fclose(f);
 }
 
-int getoptions(int argc, char **argv, or_options_t *options)
-/**
+struct config_line *config_get_commandlines(int argc, char **argv) {
+  struct config_line *new;
+  struct config_line *front = NULL;
+  char *s;
+  int i = 1;
 
-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.
+  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;
+    }
 
-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.
+    new = malloc(sizeof(struct config_line));
+    s = argv[i];
+    while(*s == '-')
+      s++;
+    new->key = strdup(s);
+    new->value = strdup(argv[i+1]);
 
-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>" },
-//      { "ReconnectPeriod", 'e',  POPT_ARG_INT,     &options->ReconnectPeriod,
-//         0, "how many seconds between retrying all OR connections", "<reconnectperiod>" },
-      { "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  /* handles --usage and --help automatically */
-      POPT_TABLEEND  /* marks end of table */
-   };
-   cmd = basename(argv[0]);
-   optCon = poptGetContext(cmd,argc,(const char **)argv,opt_tab,0);
+    log(LOG_DEBUG,"Commandline: parsed keyword '%s', value '%s'",
+      new->key, new->value);
+    new->next = front;
+    front = new;
+    i += 2;
+  }
+  return front;
+}
 
-   poptReadDefaultConfig(optCon,0);       /* read <popt> alias definitions */
+/* parse the config file and strdup into key/value strings. Return list.
+ *  * 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; /* current line number */
+  char *s;
+  char *start, *end;
 
-   /* assign default option values */
+  assert(f);
 
-   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->ReconnectPeriod = 6001;
-   options->Role = ROLE_OR_LISTEN | ROLE_OR_CONNECT_ALL | ROLE_OP_LISTEN | ROLE_AP_LISTEN;
+  fseek(f,0,SEEK_SET); /* make sure we start at the beginning of file */
 
-   code = poptGetNextOpt(optCon);         /* first we handle command-line args */
-   if ( code == -1 )
-   {
-      if ( ConfigFile )                   /* handle user-specified config file */
-         code = poptReadOptions(optCon,ConfigFile);
-      else                                /* load Default configuration files */
-         code = poptReadDefaultOptions(cmd,optCon);
-   }
+  while(fgets(line, CONFIG_LINE_MAXLEN, f)) {
+    lineno++;
 
-   switch(code)                           /* error checking */
-   {
-   case INT_MIN:
-      log(LOG_ERR, "%s: Unable to open configuration file.\n", ConfigFile);
+    /* 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;
+  }
+
+  return front;
+}
+
+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;
+
+  /* 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);
       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;
-   }
+  }
+  return 1;
+}
 
-   poptFreeContext(optCon);
+void config_assign(or_options_t *options, struct config_line *list) {
 
-   if ( code ) return code;      /* return here if we encountered any problems */
+  /* iterate through list. for each item convert as appropriate and assign to 'options'. */
 
-   /* Display options upon user request */
+  while(list) {
+    if(
 
-   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);
-   }
+    /* order matters here! abbreviated arguments use the first match. */
 
-   /* Validate options */
+    /* 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) ||
 
-   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;
-      }
-   }
+    /* int options */
+    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) ||
 
-   if ( options->Role < 0 || options->Role > 63 )
-   {
-      log(LOG_ERR,"Role option must be an integer between 0 and 63 (inclusive).");
-      code = -1;
-   }
+    /* float options */
+    config_compare(list, "CoinWeight",     CONFIG_TYPE_DOUBLE, &options->CoinWeight)
 
-   if ( options->RouterFile == NULL )
-   {
-      log(LOG_ERR,"RouterFile option required, but not found.");
-      code = -1;
-   }
+    ) {
+      /* then we're ok. it matched something. */
+    } else {
+      log(LOG_WARNING,"config_assign(): Ignoring unknown keyword '%s'.",list->key);
+    }
 
-   if ( ROLE_IS_OR(options->Role) && options->PrivateKeyFile == NULL )
-   {
-      log(LOG_ERR,"PrivateKeyFile option required for OR, but not found.");
-      code = -1;
-   }
+    list = list->next;
+  }  
+}
 
-   if ( (options->Role & ROLE_OR_LISTEN) && options->ORPort < 1 )
-   {
-      log(LOG_ERR,"ORPort option required and must be a positive integer value.");
-      code = -1;
-   }
+/* 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;
 
-   if ( (options->Role & ROLE_OP_LISTEN) && options->OPPort < 1 )
-   {
-      log(LOG_ERR,"OPPort option required and must be a positive integer value.");
-      code = -1;
-   }
+/* give reasonable defaults for each option */
+  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->ReconnectPeriod = 6001;
+  options->Role = ROLE_OR_LISTEN | ROLE_OR_CONNECT_ALL | ROLE_OP_LISTEN | ROLE_AP_LISTEN;
 
-   if ( (options->Role & ROLE_AP_LISTEN) && options->APPort < 1 )
-   {
-      log(LOG_ERR,"APPort option required and must be a positive integer value.");
-      code = -1;
-   }
+/* get config lines from /etc/torrc and assign them */
+  cmd = basename(argv[0]);
+  snprintf(fname,256,"/etc/%src",cmd);
 
-   if ( (options->Role & ROLE_DIR_LISTEN) && options->DirPort < 1 )
-   {
-      log(LOG_ERR,"DirPort option required and must be a positive integer value.");
-      code = -1;
-   }
+  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 */
 
-   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;
-   }
+/* 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);
 
-   if ( options->MaxConn <= 0 )
-   {
-      log(LOG_ERR,"MaxConn option must be a non-zero positive integer.");
-      code = -1;
-   }
+/* print config */
+  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->MaxConn >= MAXCONNECTIONS )
-   {
-      log(LOG_ERR,"MaxConn option must be less than %d.", MAXCONNECTIONS);
-      code = -1;
-   }
+/* Validate options */
 
-   if ( options->TrafficShaping != 0 && options->TrafficShaping != 1 )
-   {
-      log(LOG_ERR,"TrafficShaping option must be either 0 or 1.");
-      code = -1;
-   }
+  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->LinkPadding != 0 && options->LinkPadding != 1 )
-   {
-      log(LOG_ERR,"LinkPadding option must be either 0 or 1.");
-      code = -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->DirRebuildPeriod < 1)
-   {
-      log(LOG_ERR,"DirRebuildPeriod option must be positive.");
-      code = -1;
-   }
+  if(options->RouterFile == NULL) {
+    log(LOG_ERR,"RouterFile option required, but not found.");
+    result = -1;
+  }
 
-   if ( options->DirFetchPeriod < 1)
-   {
-      log(LOG_ERR,"DirFetchPeriod option must be positive.");
-      code = -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->KeepalivePeriod < 1)
-   {
-      log(LOG_ERR,"KeepalivePeriod option must be positive.");
-      code = -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;
+  }
 
-   return code;
+  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;
 }
 

Index: main.c
===================================================================
RCS file: /home/or/cvsroot/src/or/main.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- main.c	13 Oct 2002 13:17:27 -0000	1.32
+++ main.c	23 Nov 2002 06:49:01 -0000	1.33
@@ -645,9 +645,10 @@
   signal (SIGUSR1, catch); /* to dump stats to stdout */
   signal (SIGHUP, catch); /* to reload directory */
 
-  if ( getoptions(argc,argv,&options) ) exit(1);
+  if(getconfig(argc,argv,&options))
+    exit(1);
   log(options.loglevel,NULL);         /* assign logging severity level from options */
-  global_role = options.Role;   /* assign global_role from options. FIX: remove from global namespace later. */
+  global_role = options.Role;   /* assign global_role from options. FIXME: remove from global namespace later. */
 
   crypto_global_init();
   retval = do_main_loop();

Index: onion.c
===================================================================
RCS file: /home/or/cvsroot/src/or/onion.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- onion.c	2 Oct 2002 22:54:20 -0000	1.19
+++ onion.c	23 Nov 2002 06:49:01 -0000	1.20
@@ -208,139 +208,144 @@
   unsigned char *buf;
   routerinfo_t *router;
   unsigned char iv[16];
+  struct in_addr netaddr;
 
   assert(rarray && route && len && routelen);
 
-    /* calculate the size of the onion */
-    *len = routelen * 28 + 100; /* 28 bytes per layer + 100 bytes padding for the innermost layer */
-    log(LOG_DEBUG,"create_onion() : Size of the onion is %u.",*len);
+  /* calculate the size of the onion */
+  *len = routelen * 28 + 100; /* 28 bytes per layer + 100 bytes padding for the innermost layer */
+  log(LOG_DEBUG,"create_onion() : Size of the onion is %u.",*len);
     
-    /* allocate memory for the onion */
-    buf = (unsigned char *)malloc(*len);
-    if (!buf) {
-      log(LOG_ERR,"Error allocating memory.");
-      return NULL;
-    }
-    log(LOG_DEBUG,"create_onion() : Allocated memory for the onion.");
+  /* allocate memory for the onion */
+  buf = (unsigned char *)malloc(*len);
+  if (!buf) {
+    log(LOG_ERR,"Error allocating memory.");
+    return NULL;
+  }
+  log(LOG_DEBUG,"create_onion() : Allocated memory for the onion.");
     
-    for (i=0; i<routelen;i++) {
-      log(LOG_DEBUG,"create_onion() : %u : %s:%u, %u/%u",routelen-i,inet_ntoa(*((struct in_addr *)&((rarray[route[i]])->addr))),(rarray[route[i]])->or_port,(rarray[route[i]])->pkey,crypto_pk_keysize((rarray[route[i]])->pkey));
-    }
+  for (i=0; i<routelen;i++) {
+    netaddr.s_addr = htonl((rarray[route[i]])->addr);
+
+    log(LOG_DEBUG,"create_onion(): %u : %s:%u, %u/%u",routelen-i,
+        inet_ntoa(netaddr),
+        (rarray[route[i]])->or_port,
+        (rarray[route[i]])->pkey,
+        crypto_pk_keysize((rarray[route[i]])->pkey));
+  }
     
-    layer = (onion_layer_t *)(buf + *len - 128); /* pointer to innermost layer */
-    /* create the onion layer by layer, starting with the innermost */
-    for (i=0;i<routelen;i++) {
-      router = rarray[route[i]];
+  layer = (onion_layer_t *)(buf + *len - 128); /* pointer to innermost layer */
+  /* create the onion layer by layer, starting with the innermost */
+  for (i=0;i<routelen;i++) {
+    router = rarray[route[i]];
       
-      log(LOG_DEBUG,"create_onion() : %u",router);
-      log(LOG_DEBUG,"create_onion() : This router is %s:%u",inet_ntoa(*((struct in_addr *)&router->addr)),router->or_port);
-      log(LOG_DEBUG,"create_onion() : Key pointer = %u.",router->pkey);
-      log(LOG_DEBUG,"create_onion() : Key size = %u.",crypto_pk_keysize(router->pkey)); 
+//      log(LOG_DEBUG,"create_onion() : %u",router);
+//      log(LOG_DEBUG,"create_onion() : This router is %s:%u",inet_ntoa(*((struct in_addr *)&router->addr)),router->or_port);
+//      log(LOG_DEBUG,"create_onion() : Key pointer = %u.",router->pkey);
+//      log(LOG_DEBUG,"create_onion() : Key size = %u.",crypto_pk_keysize(router->pkey)); 
       
-      /* 0 bit */
-      layer->zero = 0;
-      /* version */
-      layer->version = OR_VERSION;
-      /* Back F + Forw F both use DES OFB*/
-      layer->backf = ONION_DEFAULT_CIPHER;
-      layer->forwf = ONION_DEFAULT_CIPHER;
-      /* Dest Port */
-      if (i) /* not last hop */
-	layer->port = rarray[route[i-1]]->or_port;
-      else
-	layer->port = 0;
-      /* Dest Addr */
-      if (i) /* not last hop */
-	layer->addr = rarray[route[i-1]]->addr;
-      else
-	layer->addr = 0;
-      /* Expiration Time */
-      layer->expire = time(NULL) + 3600; /* NOW + 1 hour */
-      /* Key Seed Material */
-      if (crypto_rand(16, layer->keyseed)) /* error */
-      {
-	log(LOG_ERR,"Error generating random data.");
-	goto error;
-      }
-      log(LOG_DEBUG,"create_onion() : Onion layer %u built : %u, %u, %u, %s, %u.",i+1,layer->zero,layer->backf,layer->forwf,inet_ntoa(*((struct in_addr *)&layer->addr)),layer->port);
+    /* 0 bit */
+    layer->zero = 0;
+    /* version */
+    layer->version = OR_VERSION;
+    /* Back F + Forw F both use DES OFB*/
+    layer->backf = ONION_DEFAULT_CIPHER;
+    layer->forwf = ONION_DEFAULT_CIPHER;
+    /* Dest Port */
+    if (i) /* not last hop */
+      layer->port = rarray[route[i-1]]->or_port;
+    else
+      layer->port = 0;
+    /* Dest Addr */
+    if (i) /* not last hop */
+      layer->addr = rarray[route[i-1]]->addr;
+    else
+      layer->addr = 0;
+    /* Expiration Time */
+    layer->expire = time(NULL) + 3600; /* NOW + 1 hour */
+    /* Key Seed Material */
+    if(crypto_rand(16, layer->keyseed)) { /* error */
+      log(LOG_ERR,"Error generating random data.");
+      goto error;
+    }
+//      log(LOG_DEBUG,"create_onion() : Onion layer %u built : %u, %u, %u, %s, %u.",i+1,layer->zero,layer->backf,layer->forwf,inet_ntoa(*((struct in_addr *)&layer->addr)),layer->port);
       
-      /* build up the crypt_path */
-      if (cpath)
-      {
-	cpath[i] = (crypt_path_t *)malloc(sizeof(crypt_path_t));
-	if (!cpath[i]) {
-	  log(LOG_ERR,"Error allocating memory.");
-	  goto error;
-	}
+    /* build up the crypt_path */
+    if(cpath) {
+      cpath[i] = (crypt_path_t *)malloc(sizeof(crypt_path_t));
+      if(!cpath[i]) {
+        log(LOG_ERR,"Error allocating memory.");
+        goto error;
+      }
       
-	log(LOG_DEBUG,"create_onion() : Building hop %u of crypt path.",i+1);
-	hop = cpath[i];
-	/* set crypto functions */
-	hop->backf = layer->backf;
-	hop->forwf = layer->forwf;
+      log(LOG_DEBUG,"create_onion() : Building hop %u of crypt path.",i+1);
+      hop = cpath[i];
+      /* set crypto functions */
+      hop->backf = layer->backf;
+      hop->forwf = layer->forwf;
 	
-	/* calculate keys */
-	crypto_SHA_digest(layer->keyseed,16,hop->digest3);
-	log(LOG_DEBUG,"create_onion() : First SHA pass performed.");
-	crypto_SHA_digest(hop->digest3,20,hop->digest2);
-	log(LOG_DEBUG,"create_onion() : Second SHA pass performed.");
-	crypto_SHA_digest(hop->digest2,20,hop->digest3);
-	log(LOG_DEBUG,"create_onion() : Third SHA pass performed.");
-	log(LOG_DEBUG,"create_onion() : Keys generated.");
-	/* set IV to zero */
-	memset((void *)iv,0,16);
+      /* calculate keys */
+      crypto_SHA_digest(layer->keyseed,16,hop->digest3);
+      log(LOG_DEBUG,"create_onion() : First SHA pass performed.");
+      crypto_SHA_digest(hop->digest3,20,hop->digest2);
+      log(LOG_DEBUG,"create_onion() : Second SHA pass performed.");
+      crypto_SHA_digest(hop->digest2,20,hop->digest3);
+      log(LOG_DEBUG,"create_onion() : Third SHA pass performed.");
+      log(LOG_DEBUG,"create_onion() : Keys generated.");
+      /* set IV to zero */
+      memset((void *)iv,0,16);
 	
-	/* initialize cipher engines */
-	if (! (hop->f_crypto = create_onion_cipher(hop->forwf, hop->digest3, iv, 1))) { 
-	  /* cipher initialization failed */
-	  log(LOG_ERR,"Could not create a crypto environment.");
-	  goto error;
-	}
+      /* initialize cipher engines */
+      if (! (hop->f_crypto = create_onion_cipher(hop->forwf, hop->digest3, iv, 1))) { 
+        /* cipher initialization failed */
+        log(LOG_ERR,"Could not create a crypto environment.");
+        goto error;
+      }
 	
-	if (! (hop->b_crypto = create_onion_cipher(hop->backf, hop->digest2, iv, 0))) { 
-	  /* cipher initialization failed */
-	  log(LOG_ERR,"Could not create a crypto environment.");
-	  goto error;
-	}
-	    
-	log(LOG_DEBUG,"create_onion() : Built corresponding crypt path hop.");
+      if (! (hop->b_crypto = create_onion_cipher(hop->backf, hop->digest2, iv, 0))) { 
+        /* cipher initialization failed */
+        log(LOG_ERR,"Could not create a crypto environment.");
+        goto error;
       }
+ 
+      log(LOG_DEBUG,"create_onion() : Built corresponding crypt path hop.");
+    }
       
-      /* padding if this is the innermost layer */
-      if (!i) {
-	if (crypto_pseudo_rand(100, (unsigned char *)layer + 28)) { /* error */
-	  log(LOG_ERR,"Error generating pseudo-random data.");
-	  goto error;
-	}
-	log(LOG_DEBUG,"create_onion() : This is the innermost layer. Adding 100 bytes of padding.");
+    /* padding if this is the innermost layer */
+    if (!i) {
+      if (crypto_pseudo_rand(100, (unsigned char *)layer + 28)) { /* error */
+        log(LOG_ERR,"Error generating pseudo-random data.");
+        goto error;
       }
+      log(LOG_DEBUG,"create_onion() : This is the innermost layer. Adding 100 bytes of padding.");
+    }
       
-      /* encrypt */
+    /* encrypt */
 
-      if (! encrypt_onion(layer,128+(i*28),router->pkey)) {
-	log(LOG_ERR,"Error encrypting onion layer.");
-	goto error;
-      }
-      log(LOG_DEBUG,"create_onion() : Encrypted layer.");
-      
-      /* calculate pointer to next layer */
-      layer = (onion_layer_t *)(buf + (routelen-i-2)*sizeof(onion_layer_t));
+    if(! encrypt_onion(layer,128+(i*28),router->pkey)) {
+      log(LOG_ERR,"Error encrypting onion layer.");
+      goto error;
     }
+    log(LOG_DEBUG,"create_onion() : Encrypted layer.");
+      
+    /* calculate pointer to next layer */
+    layer = (onion_layer_t *)(buf + (routelen-i-2)*sizeof(onion_layer_t));
+  }
 
-    return buf;
+  return buf;
  error:
-    if (buf)
-      free((void *)buf);
-    if (cpath) {
-      for (j=0;j<i;j++) {
-	if (cpath[i]->f_crypto)
-	  crypto_free_cipher_env(cpath[i]->f_crypto);
-	if (cpath[i]->b_crypto)
-	  crypto_free_cipher_env(cpath[i]->b_crypto);
-	free((void *)cpath[i]);
-      }
+  if (buf)
+    free((void *)buf);
+  if (cpath) {
+    for (j=0;j<i;j++) {
+      if(cpath[i]->f_crypto)
+        crypto_free_cipher_env(cpath[i]->f_crypto);
+      if(cpath[i]->b_crypto)
+        crypto_free_cipher_env(cpath[i]->b_crypto);
+      free((void *)cpath[i]);
     }
-    return NULL;
+  }
+  return NULL;
 }
 
 /* encrypts 128 bytes of the onion with the specified public key, the rest with 
@@ -353,60 +358,54 @@
   
   crypto_cipher_env_t *crypt_env = NULL; /* crypto environment */
  
-  if ( (onion) && (pkey) ) /* valid parameters */
-  {
-    memset((void *)iv,0,8);
+  assert(onion && pkey);
+
+  memset((void *)iv,0,8);
     
-    log(LOG_DEBUG,"Onion layer : %u, %u, %u, %s, %u.",onion->zero,onion->backf,onion->forwf,inet_ntoa(*((struct in_addr *)&onion->addr)),onion->port);
-    /* allocate space for tmpbuf */
-    tmpbuf = (unsigned char *)malloc(onionlen);
-    if (!tmpbuf)
-    {
-      log(LOG_ERR,"Could not allocate memory.");
-      return NULL;
-    }
-    log(LOG_DEBUG,"encrypt_onion() : allocated %u bytes of memory for the encrypted onion (at %u).",onionlen,tmpbuf);
+  log(LOG_DEBUG,"Onion layer : %u, %u, %u, %s, %u.",onion->zero,onion->backf,onion->forwf,inet_ntoa(*((struct in_addr *)&onion->addr)),onion->port);
+  /* allocate space for tmpbuf */
+  tmpbuf = (unsigned char *)malloc(onionlen);
+  if (!tmpbuf) {
+    log(LOG_ERR,"Could not allocate memory.");
+    return NULL;
+  }
+  log(LOG_DEBUG,"encrypt_onion() : allocated %u bytes of memory for the encrypted onion (at %u).",onionlen,tmpbuf);
   
-    /* get key1 = SHA1(KeySeed) */
-    if (crypto_SHA_digest(((onion_layer_t *)onion)->keyseed,16,digest))
-    {
-      log(LOG_ERR,"Error computing SHA1 digest.");
-      goto error;
-    }
-    log(LOG_DEBUG,"encrypt_onion() : Computed DES key.");
+  /* get key1 = SHA1(KeySeed) */
+  if (crypto_SHA_digest(((onion_layer_t *)onion)->keyseed,16,digest)) {
+    log(LOG_ERR,"Error computing SHA1 digest.");
+    goto error;
+  }
+  log(LOG_DEBUG,"encrypt_onion() : Computed DES key.");
     
-    log(LOG_DEBUG,"encrypt_onion() : Trying to RSA encrypt.");
-    /* encrypt 128 bytes with RSA *pkey */
-    if (crypto_pk_public_encrypt(pkey, (unsigned char *)onion, 128, tmpbuf, RSA_NO_PADDING) == -1) {
-      log(LOG_ERR,"Error RSA-encrypting data :%s",crypto_perror());
-      goto error;
-    }
-  
-    log(LOG_DEBUG,"encrypt_onion() : RSA encrypted first 128 bytes of the onion."); 
+  log(LOG_DEBUG,"encrypt_onion() : Trying to RSA encrypt.");
+  /* encrypt 128 bytes with RSA *pkey */
+  if (crypto_pk_public_encrypt(pkey, (unsigned char *)onion, 128, tmpbuf, RSA_NO_PADDING) == -1) {
+    log(LOG_ERR,"Error RSA-encrypting data :%s",crypto_perror());
+    goto error;
+  }
+
+  log(LOG_DEBUG,"encrypt_onion() : RSA encrypted first 128 bytes of the onion."); 
     
-    /* now encrypt the rest with DES OFB */
-    crypt_env = crypto_create_init_cipher(CRYPTO_CIPHER_DES, digest, iv, 1);
-    if (!crypt_env)
-    {
-      log(LOG_ERR,"Error creating the crypto environment.");
-      goto error;
-    }
+  /* now encrypt the rest with DES OFB */
+  crypt_env = crypto_create_init_cipher(CRYPTO_CIPHER_DES, digest, iv, 1);
+  if (!crypt_env) {
+    log(LOG_ERR,"Error creating the crypto environment.");
+    goto error;
+  }
     
-    if (crypto_cipher_encrypt(crypt_env,(unsigned char *)onion+128, onionlen-128, (unsigned char *)tmpbuf+128)) { /* error */
-      log(LOG_ERR,"Error performing DES encryption:%s",crypto_perror()); 
-      goto error;
-    }
-    log(LOG_DEBUG,"encrypt_onion() : DES OFB encrypted the rest of the onion.");
+  if (crypto_cipher_encrypt(crypt_env,(unsigned char *)onion+128, onionlen-128, (unsigned char *)tmpbuf+128)) { /* error */
+    log(LOG_ERR,"Error performing DES encryption:%s",crypto_perror()); 
+    goto error;
+  }
+  log(LOG_DEBUG,"encrypt_onion() : DES OFB encrypted the rest of the onion.");
     
-    /* now copy tmpbuf to onion */
-    memcpy((void *)onion,(void *)tmpbuf,onionlen);
-    log(LOG_DEBUG,"encrypt_onion() : Copied cipher to original onion buffer.");
-    free((void *)tmpbuf);
-    crypto_free_cipher_env(crypt_env);
-    return (unsigned char *)onion;
-  } /* valid parameters */
-  else
-    return NULL;
+  /* now copy tmpbuf to onion */
+  memcpy((void *)onion,(void *)tmpbuf,onionlen);
+  log(LOG_DEBUG,"encrypt_onion() : Copied cipher to original onion buffer.");
+  free((void *)tmpbuf);
+  crypto_free_cipher_env(crypt_env);
+  return (unsigned char *)onion;
 
  error:
   if (tmpbuf)

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/src/or/or.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- or.h	2 Oct 2002 22:54:20 -0000	1.35
+++ or.h	23 Nov 2002 06:49:01 -0000	1.36
@@ -37,7 +37,6 @@
 #include <assert.h>
 #include <time.h>
 
-#include "../common/config.h"
 #include "../common/crypto.h"
 #include "../common/log.h"
 #include "../common/ss.h"
@@ -147,6 +146,24 @@
 #define CELL_PAYLOAD_SIZE 120
 #define CELL_NETWORK_SIZE 128
 
+/* 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_LINE_MAXLEN 1024
+
+/* legal characters in a filename */
+#define CONFIG_LEGAL_FILENAME_CHARACTERS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_/"
+
+struct config_line {
+  char *key;
+  char *value;
+  struct config_line *next;
+};
+
 typedef uint16_t aci_t;
 
 /* cell definition */
@@ -348,7 +365,7 @@
    char *LogLevel;
    char *RouterFile;
    char *PrivateKeyFile;
-   float CoinWeight;
+   double CoinWeight;
    int ORPort;
    int OPPort;
    int APPort;
@@ -444,11 +461,28 @@
 
 /********************************* config.c ***************************/
 
-/* loads the configuration file */
-int getconfig(char *filename, config_opt_t *options);
+const char *basename(const char *filename);
 
-/* create or_options_t from command-line args and config files(s) */
-int getoptions(int argc, char **argv, or_options_t *options);
+/* open configuration file for reading */
+FILE *config_open(const unsigned char *filename);
+
+/* close configuration file */
+int config_close(FILE *f);
+
+struct config_line *config_get_commandlines(int argc, char **argv);
+
+/* parse the config file and strdup into key/value strings. Return list.
+ *  *  * Warn and ignore mangled lines. */
+struct config_line *config_get_lines(FILE *f);
+
+void config_free_lines(struct config_line *front);
+
+int config_compare(struct config_line *c, char *key, int type, void *arg);
+
+void config_assign(or_options_t *options, struct config_line *list);
+
+/* return 0 if success, <0 if failure. */
+int getconfig(int argc, char **argv, or_options_t *options);
 
 /********************************* connection.c ***************************/
 

Index: test_config.c
===================================================================
RCS file: /home/or/cvsroot/src/or/test_config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- test_config.c	12 Jul 2002 18:14:17 -0000	1.2
+++ test_config.c	23 Nov 2002 06:49:01 -0000	1.3
@@ -6,7 +6,7 @@
    int argc, rtn_val, failures, total;
    char fname[512];
    FILE *pipe;
-   char *argv[] = { "or", "-v", "-f", fname, NULL };
+   char *argv[] = { "or", "-f", fname, NULL };
    argc = 4;
    failures = total = 0;
    printf("Config file test suite...\n\n");
@@ -15,7 +15,7 @@
    {
       fname[strlen(fname)-1] = '\0';
       printf("%s\n--------------------\n", fname);
-      rtn_val = getoptions(argc,argv,&options);
+      rtn_val = getconfig(argc,argv,&options);
       ++total;
       if ( rtn_val)
       {