We are an OR if ORPort *or* ORBindAddress is set; similarly for being an OP

svn:r2237
This commit is contained in:
Nick Mathewson 2004-08-15 20:16:26 +00:00
parent 416653271a
commit e19af3fa0f

View file

@ -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