diff options
| author | Roger Dingledine <arma@torproject.org> | 2002-11-23 06:49:01 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2002-11-23 06:49:01 +0000 |
| commit | 00a9e3732e88d73860b772dcbac0b8275aa7f467 (patch) | |
| tree | 52069363451b9225e75f400c3fcd5e2df932921d /src/or/main.c | |
| parent | 121d029584d5f500b0d9d2c808c28645cf4937f5 (diff) | |
| download | tor-00a9e3732e88d73860b772dcbac0b8275aa7f467.tar tor-00a9e3732e88d73860b772dcbac0b8275aa7f467.tar.gz | |
remove popt dependency, consolidate config stuff
reformat parts of onion.c
svn:r136
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c index 6295bf0d6..ef0f3e55f 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -645,9 +645,10 @@ int main(int argc, char *argv[]) { 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(); |