diff options
| author | Nick Mathewson <nickm@torproject.org> | 2004-08-15 20:16:26 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2004-08-15 20:16:26 +0000 |
| commit | e19af3fa0fcf4a704048c0568ed95223b90b5e1f (patch) | |
| tree | a27f641d158da39671cdbc266784ba9e316d93f8 /src/or | |
| parent | 416653271a7505e7a219240eaeeb379d4d22afac (diff) | |
| download | tor-e19af3fa0fcf4a704048c0568ed95223b90b5e1f.tar.gz tor-e19af3fa0fcf4a704048c0568ed95223b90b5e1f.zip | |
We are an OR if ORPort *or* ORBindAddress is set; similarly for being an OP
svn:r2237
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c index 74b79c6346..fdd0aed81c 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -465,7 +465,7 @@ int clique_mode(void) { /** Return true iff we are trying to be a server. */ int server_mode(void) { - return (options.ORPort != 0); + return (options.ORPort != 0 || options.ORBindAddress); } /** Remember if we've advertised ourselves to the dirservers. */ @@ -479,7 +479,7 @@ int advertised_server_mode(void) { /** Return true iff we are trying to be a socks proxy. */ int proxy_mode(void) { - return (options.SocksPort != 0); + return (options.SocksPort != 0 || options.SocksBindAddress); } /** Perform regular maintenance tasks. This function gets run once per |