diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-08-17 12:34:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-08-17 12:34:52 -0400 |
| commit | 1728801bbc42f45e561812d8655b7f46fc740ea8 (patch) | |
| tree | da167c310b0e16ec2b15afe94154b999eebc4b42 /src/or/router.c | |
| parent | a4669d8704af7e9d978cb392e6a8df79376207b3 (diff) | |
| parent | 676f71054f11727fdfa8707979d8c6fe143c9333 (diff) | |
| download | tor-1728801bbc42f45e561812d8655b7f46fc740ea8.tar tor-1728801bbc42f45e561812d8655b7f46fc740ea8.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.3'
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/router.c b/src/or/router.c index 20767d8a3..1d45d5659 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -798,7 +798,7 @@ int check_whether_dirport_reachable(void) { const or_options_t *options = get_options(); - return !options->DirPort || + return !options->DirPort_set || options->AssumeReachable || net_is_disabled() || can_reach_dir_port; @@ -1116,7 +1116,8 @@ int server_mode(const or_options_t *options) { if (options->ClientOnly) return 0; - return (options->ORPort || options->ORListenAddress); + /* XXXX024 I believe we can kill off ORListenAddress here.*/ + return (options->ORPort_set || options->ORListenAddress); } /** Return true iff we are trying to be a non-bridge server. |