diff options
| author | Roger Dingledine <arma@torproject.org> | 2002-10-02 22:54:20 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2002-10-02 22:54:20 +0000 |
| commit | bf53852a002f3a0b323ebf67354f2d7a1e4039e6 (patch) | |
| tree | dd02f724114715c6eea4aba53dc0392d7c1204b7 /src/or/main.c | |
| parent | bef3424bec7ddc67f9d561b1e7f5aa652fb4893f (diff) | |
| download | tor-bf53852a002f3a0b323ebf67354f2d7a1e4039e6.tar tor-bf53852a002f3a0b323ebf67354f2d7a1e4039e6.tar.gz | |
cleanup and a variety of bugfixes
svn:r132
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/or/main.c b/src/or/main.c index 971a34b8b..36df1f1a4 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -162,11 +162,6 @@ connection_t *connection_get_by_type(int type) { -/* FIXME can we cut this function out? */ -connection_t *connect_to_router_as_op(routerinfo_t *router) { - return connection_connect_to_router_as_op(router, options.ORPort); -} - void connection_watch_events(connection_t *conn, short events) { assert(conn && conn->poll_index < nfds); @@ -446,7 +441,7 @@ int do_main_loop(void) { crypto_pk_env_t *prkey; /* load the routers file */ - if(router_get_list_from_file(options.RouterFile, options.ORPort) < 0) { + if(router_get_list_from_file(options.RouterFile) < 0) { log(LOG_ERR,"Error loading router list."); return -1; } @@ -478,7 +473,7 @@ int do_main_loop(void) { } if(please_fetch_directory) { if(options.Role & ROLE_DIR_SERVER) { - if(router_get_list_from_file(options.RouterFile, options.ORPort) < 0) { + if(router_get_list_from_file(options.RouterFile) < 0) { log(LOG_ERR,"Error reloading router list. Continuing with old list."); } } else { |